fixed some bugs with merge from upstream

src/scripts/site.js

@@ -588,7 +588,7 @@ var AppInfo = {};
         console.log("Begin onAppReady");
 
         // ensure that appHost is loaded in this point
-        require(['apphost'], function (appHost) {
+        require(['apphost', 'appRouter'], function (appHost, appRouter) {
             var isInBackground = -1 !== self.location.href.toString().toLowerCase().indexOf("start=backgroundsync");
 
             window.Emby = {};
@@ -603,10 +603,9 @@ var AppInfo = {};
                     require(['css!devices/ios/ios.css']);
                 }
 
-                require(['appRouter', 'scripts/themeloader', 'libraryMenu'], function (pageObjects) {
-                    window.Emby.Page = pageObjects;
+                window.Emby.Page = appRouter;
 
-                require(['scripts/routes'], function () {
+                require(['scripts/themeloader', 'libraryMenu', 'scripts/routes'], function () {
                     Emby.Page.start({
                         click: false,
                         hashbang: true