Merge branch 'master' into master-redesign

Conflicts:
	app/views/project/list.jade

services/web/public/coffee/app/user-details.coffee

@@ -20,10 +20,10 @@ define [
 
 		$http.get("/user/personal_info").success (data)->
 			$scope.userInfoForm =
-				first_name: data.first_name
-				last_name: data.last_name
-				role: 	   data.role
-				institution: data.institution
+				first_name: data.first_name || ""
+				last_name: data.last_name || ""
+				role: 	   data.role || ""
+				institution: data.institution || ""
 				_csrf : window.csrfToken
 
 			if getPercentComplete() != 100
@@ -41,7 +41,7 @@ define [
 			$scope.percentComplete = getPercentComplete()
 
 		getPercentComplete = ->
-			results = _.filter $scope.userInfoForm, (value)-> value? and value?.length != 0
+			results = _.filter $scope.userInfoForm, (value)-> !value? or value?.length != 0
 			results.length * 20
 
 		$scope.updateInstitutionsList = (inputVal)->
@@ -53,5 +53,5 @@ define [
 				
 			Institutions.search $scope.userInfoForm.institution, (err, response)->
 				$scope.institutions = _.map response.hits, (institution)->
-					"#{institution.name} (<span class='muted'>#{institution.domain}</span>)"
+					"#{institution.name} (#{institution.domain})"