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

Conflicts:
	store/templates/region.html
	store/views/__init__.py