tidying, no real changes
fixed some ui bugs
added addfireApparatusSpec support
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-controllers/src/edu/ycp/cs320/controllers/GetCalendarController.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/CreateInitialData.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/FakeDatabase.java
	ycp-cs320-project-ui/.settings/com.google.gdt.eclipse.core.prefs
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/CalendarService.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/CalendarServiceAsync.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/LoginView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/server/CalendarServiceImpl.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/Events.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/FireCalendar.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/FireCalendarEvent.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/FireCalendarList.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java