Merge branch 'temp8-upgrade-angular' of https://github.com/umbraco/Umbraco-CMS into temp8-upgrade-angular

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/routes.js

src/Umbraco.Web.UI.Client/src/routes.js

@@ -190,7 +190,6 @@ app.config(function ($routeProvider) {
         })
         .otherwise({ redirectTo: '/login' });
     }).config(function ($locationProvider) {
-
-        $locationProvider.html5Mode(false).hashPrefix(''); //turn html5 mode off
         
+        $locationProvider.html5Mode(false).hashPrefix(''); //turn html5 mode off
     });