General CSS cleanup
Merge branch 'master' into css_cleanup_kondou

Conflicts:
	core/css/styles.css
	settings/templates/personal.php
Merge pull request #3912 from owncloud/css_cleanup_kondou

General CSS cleanup