ui changes
more tweaking
Merge branch 'host_changes'

Conflicts:
	coffee/orders/templates/base.html