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

services/web/app/coffee/models/User.coffee

@@ -31,6 +31,9 @@ UserSchema = new Schema
 							collaborators: { type:Number,  default: Settings.defaultFeatures.collaborators }
 							versioning:    { type:Boolean, default: Settings.defaultFeatures.versioning }
 							dropbox:       { type:Boolean, default: Settings.defaultFeatures.dropbox }
+							github:        { type:Boolean, default: Settings.defaultFeatures.github }
+							compileTimeout: { type:Number, default: Settings.defaultFeatures.compileTimeout }
+							compileGroup:  { type:String,  default: Settings.defaultFeatures.compileGroup }
 						}
 	featureSwitches	  : {
 							github: {type: Boolean}

services/web/app/views/project/editor/left-menu.jade

@@ -40,7 +40,7 @@ aside#left-menu.full-size(
 					ng-click="openCloneProjectModal()"
 				)
 					i.fa.fa-fw.fa-copy
-					|   #{translate("copy_project")}
+					|    #{translate("copy_project")}
 			li(ng-controller="TemplatesController", ng-show="permissions.admin")
 				a(ng-click="openPublishTemplateModal()")
 					i.fa.fa-external-link.fa-fw 

services/web/config/settings.defaults.coffee

@@ -131,6 +131,8 @@ module.exports =
 		collaborators: -1
 		dropbox: true
 		versioning: true
+		compileTimeout: 60
+		compileGroup: "standard"
 
 	plans: plans = [{
 		planCode: "personal"