Merge branch 'jl_frame' of github.com:ArcBees/arcbees-website into arcbees_3_0
Merge branch 'arcbees_3_0' of github.com:ArcBees/arcbees-website into arcbees_3_0
Merge branch 'arcbees_3_0' of github.com:ArcBees/arcbees-website into arcbees_3_0
docs chosen & elastic
fix comment
Merge pull request #32 from ArcBees/lm_docsChosenElastic

Docs chosen elastic
Merge branch 'arcbees_3_0' into jl_nav

Conflicts:
	src/main/java/com/arcbees/website/client/NameTokens.java
Fixing unwanted docs.gss style applying everywhere