Merge branch 'master' of https://github.com/owncloud/core into scrutinizer_fix_1_kondou

Conflicts:
	core/js/jquery.avatar.js