Merge origin/master

Conflicts:
	Booxtore-war/web/order.html
Merge origin/master