more changes for order

more changes for order
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/OrderController.php