Merge branch 'master' into organizer-ui

Conflicts:
	brambling/templates/brambling/event/order/shop.html