Merge branch 'master' of https://github.com/sharelatex/filestore-sharelatex

Conflicts:
	package.json

services/filestore/.gitignore

@@ -56,6 +56,7 @@ test/unit/js/
 test/acceptence/js
 
 user_files/*
+template_files/*
 
 **.swp
 

services/filestore/config/settings.defaults.coffee

@@ -21,6 +21,7 @@ module.exports =
 			# Must contain full path, e.g. "/var/lib/sharelatex/data".
 			# This path must exist, not be tmpfs and be writable to by the user sharelatex is run as.
 			user_files: Path.resolve(__dirname + "/../user_files")
+			template_files: Path.resolve(__dirname + "/../template_files")
 		# if you are using S3, then fill in your S3 details below
 		# s3:
 		# 	key: ""

services/filestore/package.json

@@ -1,6 +1,11 @@
 {
   "name": "filestore-sharelatex",
-  "version": "0.0.1",
+  "version": "0.1.0",
+  "description": "An API for CRUD operations on binary files stored in S3",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sharelatex/filestore-sharelatex.git"
+  },
   "dependencies": {
     "async": "~0.2.10",
     "coffee-script": "~1.7.1",