Merge branch 'develop' into Eole_Graph

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

1 files changed, 24 insertions, 21 deletions

diff --git a/client/js/services/Loading.js b/client/js/services/Loading.js
index db06194..7ea2b42 100644
--- a/client/js/services/Loading.js
+++ b/client/js/services/Loading.js
@@ -1,23 +1,26 @@
+/**
+ * Loading service
+ * @param {type} param1
+ * @param {type} param2
+ */
+mainApp.factory('Loading', [function () {
+        /**
+         * Display Loading modal
+         */
+        var start = function () {
+            $('#loadingModal').modal({backdrop: 'static', keyboard: false});
+        };
 
-mainApp.factory('Loading',[ function(){
-	/**
-	 * Display Loading modal
-	 */
-	var start=function(){
-		$('#loadingModal').modal({backdrop: 'static', keyboard: false});	
-	};
+        /**
+         * Hide Loading modal
+         */
+        var stop = function () {
+            $('#loadingModal').modal('hide');
+        };
 
-	/**
-	 * Hide Loading modal
-	 */
-	var stop=function(){
-		$('#loadingModal').modal('hide');
-	}
-
-
-	// Service returns
-	return {
-		start:start,
-		stop:stop
-	};
-}]);
+        // Service returns
+        return {
+            start: start,
+            stop: stop
+        };
+    }]);