Merge remote-tracking branch 'upstream/master'

Conflicts [now Fixed]:
	ui/bartendro/__init__.py
	ui/bartendro/view/ws/drink.py
	ui/bartendro_server.py
	ui/config.py.default
	ui/content/templates/admin/layout
	ui/content/templates/admin/liquidout
	ui/content/templates/drink/index