Merge branch 'master' into oc_avatars

diff --cc core/routes.php
index 388fa934c4d2fb2bdd99050c7058ef95e66f20a2,d8c2d03236f4864b436b13d61c037c0d2417bcf7..57e25c0f1f7371576aeeece169f8225941b2d116
--- 1/core/routes.php
--- 2/core/routes.php
+++ b/core/routes.php
@@@ -44,37 -44,19 +44,36 @@@ $this->create('core_ajax_routes', '/cor
        ->action('OC_Router', 'JSRoutes');
  $this->create('core_ajax_preview', '/core/preview.png')
        ->actionInclude('core/ajax/preview.php');
- OC::$CLASSPATH['OC_Core_LostPassword_Controller'] = 'core/lostpassword/controller.php';
  $this->create('core_lostpassword_index', '/lostpassword/')
        ->get()
-       ->action('OC_Core_LostPassword_Controller', 'index');
+       ->action('OC\Core\LostPassword\Controller', 'index');
  $this->create('core_lostpassword_send_email', '/lostpassword/')
        ->post()
-       ->action('OC_Core_LostPassword_Controller', 'sendEmail');
+       ->action('OC\Core\LostPassword\Controller', 'sendEmail');
  $this->create('core_lostpassword_reset', '/lostpassword/reset/{token}/{user}')
        ->get()
-       ->action('OC_Core_LostPassword_Controller', 'reset');
+       ->action('OC\Core\LostPassword\Controller', 'reset');
  $this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{user}')
        ->post()
-       ->action('OC_Core_LostPassword_Controller', 'resetPassword');
+       ->action('OC\Core\LostPassword\Controller', 'resetPassword');
  
 +// Avatar routes
 +$this->create('core_avatar_get_tmp', '/avatar/tmp')
 +      ->get()
 +      ->action('OC\Core\Avatar\Controller', 'getTmpAvatar');
 +$this->create('core_avatar_get', '/avatar/{user}/{size}')
 +      ->get()
 +      ->action('OC\Core\Avatar\Controller', 'getAvatar');
 +$this->create('core_avatar_post', '/avatar/')
 +      ->post()
 +      ->action('OC\Core\Avatar\Controller', 'postAvatar');
 +$this->create('core_avatar_delete', '/avatar/')
 +      ->delete()
 +      ->action('OC\Core\Avatar\Controller', 'deleteAvatar');
 +$this->create('core_avatar_post_cropped', '/avatar/cropped')
 +      ->post()
 +      ->action('OC\Core\Avatar\Controller', 'postCroppedAvatar');
 +
  // Not specifically routed
  $this->create('app_css', '/apps/{app}/{file}')
        ->requirements(array('file' => '.*.css'))

diff --cc lib/base.php
Simple merge

diff --cc settings/js/personal.js
Simple merge