Merge branch 'github-sync'

Conflicts:
	package.json

services/web/test/UnitTests/coffee/Project/ProjectControllerTests.coffee

@@ -198,8 +198,8 @@ describe "ProjectController", ->
 					first_name: 'James'
 				'user-2':
 					first_name: 'Henry'
+			@users[@user._id] = @user # Owner
 			@UserModel.findById = (id, fields, callback) =>
-				fields.should.equal 'first_name last_name'
 				callback null, @users[id]
 
 			@LimitationsManager.userHasSubscriptionOrIsGroupMember.callsArgWith(1, null, false)
@@ -224,6 +224,12 @@ describe "ProjectController", ->
 				done()
 			@ProjectController.projectListPage @req, @res
 
+		it "should send the user", (done)->
+			@res.render = (pageName, opts)=>
+				opts.user.should.deep.equal @user
+				done()
+			@ProjectController.projectListPage @req, @res
+
 		it "should inject the users", (done) ->
 			@res.render = (pageName, opts)=>
 				opts.projects[0].owner.should.equal (@users[@projects[0].owner_ref])