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
Merge pull request #10 from KShaw29/timsBranch

Threw in the calc
Fixed merge issues with Ryan, Kelly, and Tim's to master
Merge pull request #11 from KShaw29/masterPix

Fixed merge issues with Ryan, Kelly, and Tim's to master
Added reorder drink and button/text hiding
Update UBER Button and MyTab.java
search liquor
searching
----
Merge pull request #12 from KShaw29/searchingStuff

Searching stuff
Updated some UI to landscape
Merge pull request #13 from KShaw29/masterPix

Master pix
Fixed List view in Landscape
Merge pull request #14 from KShaw29/moreUIChanges

Fixed List view in Landscape
Merge branch 'workingMaster' into testMerge

Conflicts:
	src/com/itcs4155/haveyourbac/MyTab.java