Merge branch 'master' into movable_apps_2

diff --cc index.php
index 787485555fbab50c320796874fa4c5c64cf43c6b,9fff459807e1641fc23d096ec11f7423419a18f3..fe8f7f15038e1f059765516852734500eb8fe1ed
--- 1/index.php
--- 2/index.php
+++ b/index.php
@@@ -55,18 -54,14 +55,17 @@@ elseif(OC_User::isLoggedIn()) 
                OC_User::logout();
                header("Location: ".OC::$WEBROOT.'/');
                exit();
 -      }
 -      else {
 -              OC_Util::redirectToDefaultPage();
 +      }else{
 +              if(is_null(OC::$REQUESTEDFILE)){
 +                      OC::loadapp();
 +              }else{
 +                      OC::loadfile();
 +              }
 +              
        }
- }
  
  // For all others cases, we display the guest page :
- else {
+ } else {
        OC_App::loadApps();
        $error = false;
  

diff --cc lib/base.php
Simple merge

diff --cc lib/util.php
Simple merge