fix bug
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/application/views/order/placeOrder.php
â