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

Conflicts:
	trunk/assets/frontend/css/components/stream-video-widget.less
	trunk/assets/frontend/css/dashboard.css
25534 Help is out of alignment