Merge remote-tracking branch 'amanda/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
database working
login and home page working, adds new users, logs in existing users,
database working
Merge remote-tracking branch 'Alana/master'
Added Cabs to Web Service