Merge remote-tracking branch 'origin/master' into spg_open_source_headers

Conflicts:
	src/main/resources/com/arcbees/gwtpwebsite/client/application/common/commonStyles.css
Merge remote-tracking branch 'origin/spg_open_source_headers' into spg_more_features