show 2 last drinks on frontpage
changed naming in schema
Merge branch 'master' of https://github.com/frodetbj/barkeep

Conflicts:
	app/controllers/common.js
	web/shared/views/drink.js