Fixed derby log
Merge branch 'master' of github.com:apalmeri/BuzzMate

Conflicts:
	BuzzMateWebService/src/edu/ycp/cs/cs496/locations/model/persist/Database.java
	BuzzMateWebService/src/edu/ycp/cs/cs496/locations/model/persist/DerbyDatabase.java
	BuzzMateWebService/war/_view/home.jsp
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
login/database works again, everything in order
Merge remote-tracking branch 'Alana/master'