CR fixes
Merge branches 'spg_buy_form_2' and 'spg_hidden_keys_2' of https://github.com/ArcBees/gwtp-website into spg_hidden_keys_2

Conflicts:
	src/main/java/com/arcbees/gwtpwebsite/client/application/order/OrderPresenter.java