Merge branch 'master' into fix-7307

Conflicts:
	core/js/router.js
	settings/js/admin.js

diff --cc apps/files/js/filelist.js
Simple merge

diff --cc apps/files/js/files.js
Simple merge

diff --cc lib/base.php
Simple merge

diff --cc settings/js/admin.js
index cfb1cb788d058f5f506ec56b6f42d715a0f36c7c,684822f18342aa892b18cab448ca0f544c592619..c04c0505deb3d602f91680aa81e838e6d41424cd
--- 1/settings/js/admin.js
--- 2/settings/js/admin.js
+++ b/settings/js/admin.js
@@@ -62,10 -62,18 +62,18 @@@ $(document).ready(function()
        });
  
        $('#mail_settings').change(function(){
-               OC.msg.startSaving('#mail_settings .msg');
+               OC.msg.startSaving('#mail_settings_msg');
                var post = $( "#mail_settings" ).serialize();
 -              $.post(OC.Router.generate('settings_mail_settings'), post, function(data){
 -                      OC.msg.finishedSaving('#mail_settings_msg', data);
 +              $.post(OC.generateUrl('/settings/admin/mailsettings'), post, function(data){
 +                      OC.msg.finishedSaving('#mail_settings .msg', data);
                });
        });
 -              $.post(OC.Router.generate('settings_admin_mail_test'), post, function(data){
+ 
+       $('#sendtestemail').click(function(){
+               OC.msg.startAction('#sendtestmail_msg', t('settings', 'Sending...'));
+               var post = $( "#sendtestemail" ).serialize();
++              $.post(OC.generateUrl('/settings/admin/mailtest'), post, function(data){
+                       OC.msg.finishedAction('#sendtestmail_msg', data);
+               });
+       });
  });

diff --cc settings/routes.php
Simple merge