Added WineList and such
Merge branch 'master' into masterAddingWineAndAlcListActivities

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	res/values/strings.xml
Merge pull request #9 from KShaw29/masterAddingWineAndAlcListActivities

Master adding wine and alc list activities