Merge branch 'develop' into Eole_Graph

Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html

1 files changed, 9 insertions, 10 deletions

diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index 6f398ad..c3e634b 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -6,15 +6,14 @@
  * @param {$scope} $scope The $scope service from angular
  * @param {Identity} The Identity service
  */
-mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($scope, Identity, $rootScope)
-{
+mainApp.controller('statusCtrl', ['$scope', 'Identity', '$rootScope', function ($scope, Identity, $rootScope)
+    {
+        // Give profile to model
+        $scope.profile = Identity.getProfile();
 
-	// Give profile to model
-    $scope.profile=Identity.getProfile();
-	
-    // Function to logout
-    $scope.logout=function(){
-		Identity.logout();
-	};
+        // Function to logout
+        $scope.logout = function () {
+            Identity.logout();
+        };
 
-}]);
+    }]);