Merged revisions 3845-3876 and 3879-3918 from stable branch.

hellkat

2013-03-26 cc65688b3da3e16729a1f73dd50fd975bd1ff741

 server/server.php

@@ -196,8 +196,8 @@
   $app->uses('modules,plugins,file,services');
   // Load the modules that are im the mods-core folder
   $app->modules->loadModules('core');
   // Load the plugins that are in the plugins-core folder
   $app->plugins->loadPlugins('core');
   // Load the plugins that are in the f folder
   //$app->plugins->loadPlugins('core');
}