dont call enable versioning on join project

services/web/app/coffee/Features/Editor/EditorController.coffee

@@ -41,26 +41,24 @@ module.exports = EditorController =
 			return callback(error) if error?
 			ProjectGetter.populateProjectWithUsers project, (error, project) ->
 				return callback(error) if error?
-				VersioningApiHandler.enableVersioning project, (error) ->
-					return callback(error) if error?
-					AuthorizationManager.getPrivilegeLevelForProject project, user,
-						(error, canAccess, privilegeLevel) ->
-							if error? or !canAccess
-								callback new Error("Not authorized")
-							else
-								client.join(project_id)
-								client.set("project_id", project_id)
-								client.set("owner_id", project.owner_ref._id)
-								client.set("user_id", user._id)
-								client.set("first_name", user.first_name)
-								client.set("last_name", user.last_name)
-								client.set("email", user.email)
-								client.set("connected_time", new Date())
-								client.set("signup_date", user.signUpDate)
-								client.set("login_count", user.loginCount)
-								client.set("take_snapshots", project.existsInVersioningApi)
-								AuthorizationManager.setPrivilegeLevelOnClient client, privilegeLevel
-								callback null, ProjectEditorHandler.buildProjectModelView(project), privilegeLevel, EditorController.protocolVersion
+				AuthorizationManager.getPrivilegeLevelForProject project, user,
+					(error, canAccess, privilegeLevel) ->
+						if error? or !canAccess
+							callback new Error("Not authorized")
+						else
+							client.join(project_id)
+							client.set("project_id", project_id)
+							client.set("owner_id", project.owner_ref._id)
+							client.set("user_id", user._id)
+							client.set("first_name", user.first_name)
+							client.set("last_name", user.last_name)
+							client.set("email", user.email)
+							client.set("connected_time", new Date())
+							client.set("signup_date", user.signUpDate)
+							client.set("login_count", user.loginCount)
+							client.set("take_snapshots", project.existsInVersioningApi)
+							AuthorizationManager.setPrivilegeLevelOnClient client, privilegeLevel
+							callback null, ProjectEditorHandler.buildProjectModelView(project), privilegeLevel, EditorController.protocolVersion
 
 	leaveProject: (client, user) ->
 		self = @

services/web/app/coffee/Features/Templates/TemplatesController.coffee

@@ -23,6 +23,9 @@ module.exports =
 		request(zipUrl).pipe(writeStream)
 		writeStream.on 'close', ->
 			ProjectUploadManager.createProjectFromZipArchive req.session.user._id, req.session.templateData.templateName, dumpPath, (err, project)->
+				if err?
+					logger.err err:err, zipUrl:zipUrl, "problem building project from zip"
+					return res.send 500
 				setCompiler project._id, req.session.templateData.compiler, ->
 					fs.unlink dumpPath, ->
 					delete req.session.templateData

services/web/test/UnitTests/coffee/Editor/EditorControllerTests.coffee

@@ -121,10 +121,6 @@ describe "EditorController", ->
 			it "should return the project model view, privilege level and protocol version", ->
 				@callback.calledWith(null, @projectModelView, "owner", @EditorController.protocolVersion).should.equal true
 
-			it "should enable versioning", ->
-				@VersioningApiHandler.enableVersioning.calledWith(@project)
-					.should.equal true
-
 		describe "when not authorized", ->
 			beforeEach ->
 				@AuthorizationManager.getPrivilegeLevelForProject =