Konami
Merge branch 'arcbees_3_0' of github.com:ArcBees/arcbees-website into arcbees_3_0

Conflicts:
	pom.xml
	src/main/java/com/arcbees/website/Arcbees.gwt.xml
	src/main/java/com/arcbees/website/client/resources/AppResources.java