#23 crossbrowser style
Merge branch 'master' into fix/23-crossbrowser-style

Conflicts:
	public/css/help.css
Merge branch 'fix/23-crossbrowser-style'