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