omit
Merge branch 'master' of https://github.com/dhonorez/GetDrunk

Conflicts:
	src/main/webapp/public/js/controller/mainController.js