Common and Model are in the same package
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into beta