CR fix
Merge branches 'ab_fix_master' and 'master' of https://github.com/ArcBees/gwtp-website into ab_fix_master

Conflicts:
	src/main/java/com/arcbees/gwtpwebsite/client/application/header/HeaderView.ui.xml
Cr fix
Merge pull request #84 from ArcBees/ab_fix_master

Ab fix master