Merge pull request #647 from owncloud/fix_app_settings_navigation

Move loading of all the apps to setting the active navigation entry.

lib/app.php

@@ -253,6 +253,8 @@ class OC_App{
 	 * highlighting the current position of the user.
 	 */
 	public static function setActiveNavigationEntry( $id ) {
+		// load all the apps, to make sure we have all the navigation entries
+		self::loadApps();
 		self::$activeapp = $id;
 		return true;
 	}

lib/base.php

@@ -512,7 +512,6 @@ class OC{
 			return;
 		}
 		try {
-			OC_App::loadApps();
 			OC::getRouter()->match(OC_Request::getPathInfo());
 			return;
 		} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {