Adding seek bars to drink info page, not complete
Merge branch 'master' of https://github.com/teamGaia/OneDrinkAway.git

Conflicts:
	OneDrinkAway/res/layout/activity_drink_info_page.xml
	
Eclipse made me push the project.properties. Sorry if this causes
conflicts