25534 Help is out of alignment
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/assets/frontend/css/auth.css
	trunk/assets/frontend/css/components/header.less
	trunk/assets/frontend/css/dashboard.css