I changed things, but can't remember what... These changes will be
overriden after the merge
Merge branch 'master' of https://github.com/teamGaia/OneDrinkAway.git

Conflicts:
	OneDrinkAway/project.properties
	OneDrinkAway/src/com/onedrinkaway/app/HomePage.java
	OneDrinkAway/src/com/onedrinkaway/app/SearchByName.java