Some shtuph
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into
beta

Conflicts:
	OneDrinkAway/project.properties
Common and Model are in the same package