Merge branch 'master' into hide_remove_image_avatar

diff --cc settings/js/personal.js
index f38ec4e9ab1e0f383e865926d417b77ae9712ffe,7a4257f1c973002aea90eb2815383b3003f45a25..26c50f8fa5de26e24a96da2da89683295b3b36f7
--- 1/settings/js/personal.js
--- 2/settings/js/personal.js
+++ b/settings/js/personal.js
@@@ -255,10 -253,9 +255,10 @@@ $(document).ready(function()
        $('#removeavatar').click(function(){
                $.ajax({
                        type:   'DELETE',
-                       url:    OC.Router.generate('core_avatar_delete'),
+                       url:    OC.generateUrl('/avatar/'),
                        success: function(msg) {
                                updateAvatar(true);
 +                              $('#removeavatar').addClass('hidden');
                        }
                });
        });