Merge remote-tracking branch 'Alana/master'

Conflicts:
	BuzzMateApp/AndroidManifest.xml
	BuzzMateApp/src/edu/ycp/cs/cs496/buzzmateapp/MobileApplicationClient.java
	BuzzMateWebService/src/edu/ycp/cs/cs496/locations/model/persist/IDatabase.java
Drunk Game Finished
Revised Drunk Test
Merge remote-tracking branch 'Alana/master'
Added Cabs to Web Service
Merge remote-tracking branch 'amanda/master'

Conflicts:
	BuzzMateApp/src/edu/ycp/cs/cs496/buzzmateapp/MobileApplicationClient.java
	BuzzMateWebService/derby.log
	BuzzMateWebService/src/edu/ycp/cs/cs496/locations/model/persist/CreateInitialData.java
	BuzzMateWebService/src/edu/ycp/cs/cs496/locations/model/persist/Database.java
	BuzzMateWebService/war/_view/home.jsp