added addfireApparatusSpec support
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/derby.log
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/CreateInitialData.java
	ycp-cs320-project-ui/.settings/com.google.gdt.eclipse.core.prefs