Merge branch 'master' of github.com:sharelatex/sharelatex-docker-image

server-ce/settings.coffee

@@ -295,7 +295,14 @@ settings =
 	references:{}
 	notifications:undefined
 
-
+	defaultFeatures:
+		collaborators: -1
+		dropbox: true
+		versioning: true
+		compileTimeout: 180
+		compileGroup: "standard"
+		references: true
+		templates: true
 
 #### OPTIONAL CONFIGERABLE SETTINGS