Merge master into HEAD

Conflicts:
	application/controllers/admin/order.php
	application/views/admin/orders/index.php