Differentiation of Bars and Food
Adding Clickable from list
Finished selecting from the list; using Linkify!
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