Merge branch 'develop' into Eole_Graph

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

1 files changed, 15 insertions, 14 deletions

diff --git a/client/js/app.js b/client/js/app.js
index a26e0ec..4ef35b5 100644
--- a/client/js/app.js
+++ b/client/js/app.js
@@ -3,7 +3,7 @@
  * The main app module instance
  * @type angular.module.angular-1_3_6_L1749.moduleInstance
  */
-var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize', 'ngCookies']);
+var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize', 'ngCookies','lr.upload']);
 
 /**
  * Configure routeProvider
@@ -12,19 +12,20 @@ mainApp.config(['$routeProvider', function($routeProvider){
         
         
         $routeProvider.
-                when('/home',{
-                    templateUrl: 'partials/home/home.html',
-                    controller: 'homeCtrl'
-        }).
-                when('/network',{
-                    templateUrl: 'partials/network/network.html',
-                    controller: 'networkCtrl'
-		}).
-		        when('/image',{
-                    templateUrl: 'partials/image/image.html',
-                    controller: 'imageCtrl'
-        }).otherwise({
-            redirectTo: '/'
+            when('/home',{
+                templateUrl: 'partials/home/home.html',
+                controller: 'homeCtrl'
+            }).
+            when('/network',{
+                templateUrl: 'partials/network/network.html',
+                controller: 'networkCtrl'
+            }).
+            when('/image',{
+                templateUrl: 'partials/image/image.html',
+                controller: 'imageCtrl'
+            })
+            .otherwise({
+                redirectTo: '/home'
         });
 }]);