Check drink in detail view
Merge branch 'master' of github.com:freakimkaefig/boris

Conflicts:
	src/js/MainController.js
Check availability in list, logout