Removing metadata file
Adding .metadata to gitignore
Adding session controller
Refactoring a bit
Adding sql changes
fixing update method
fixing update method - typo
Debug
debug
Fixing case in names of shit...
Adding file upload things
Adding moar session stuff
oddity in uuid field
>:| as i commit endlessly trying to work out a problem, its actually an H99 platform error on heroku... rebasing
Merge branch 'master' into KAPI-2

Conflicts:
	app/models/Drink.java