Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into sharing_mail_notification_master

Conflicts:
	core/ajax/share.php