Merge branch 'canary' of https://github.com/angular-fullstack/generator-angular-fullstack into webpack

# Conflicts:
#	templates/app/client/components/auth(auth)/router.decorator.js

Author: Awk34

templates/app/client/components/auth(auth)/router.decorator.js

@@ -31,9 +31,9 @@ export function routerDecorator($rootScope<% if(filters.ngroute) { %>, $location
 
         event.preventDefault();
         <%_ if(filters.ngroute) { _%>
-        $location.path('/');<% } %>
+        $location.path('/login');<% } %>
         <%_ if(filters.uirouter) { _%>
-        $state.go('main');<% } %>
+        $state.go('login');<% } %>
       });
     }
   });