Added objects, fixed routes and encoding
Merge branch 'master' of https://github.com/dhonorez/GetDrunk

Conflicts:
	pom.xml