current order
Merge remote-tracking branch 'origin/master'

Conflicts:
	store/templates/current_orders.html
	store/views/current_orders.py