Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring

diff --cc help/index.php
index e6a2d5661f576aac637ba604a8f2f2c5bbe293de,f77972f58a7f8f11b4f990a99dc09128c0a386fb..de461c2941239f7d685acb8376f440e1182af156
--- 1/help/index.php
--- 2/help/index.php
+++ b/help/index.php
@@@ -7,8 -7,14 +7,13 @@@ if( !OC_USER::isLoggedIn())
      exit();
  }
  
+ //hardcode for testing
+ $pagecount=8;
+ $page=2;
+ 
+ 
  // Load the files we need
  OC_UTIL::addStyle( "help", "help" );
 -
  OC_APP::setActiveNavigationEntry( "help" );
  
  $kbe=OC_OCSCLIENT::getKnownledgebaseEntries();