very small changes
Renamed DemoView class to LoginView as this is our main login view
Added an apparatus view to display the information about the fire
station's equipment
Calendar is being updated
calendar updated...needs home on site
Added link for apparatus on home page
Merge remote-tracking branch 'drew/master'

Conflicts:
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/DemoView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/LoginView.java
Merge remote-tracking branch 'drew/master'

Conflicts:
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/Ycp_cs320_project_ui.java
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ycp-cs320-project-ui/.classpath
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/Ycp_cs320_project_ui.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/calendar.java
Push!!!
update
Removed LoginViewOld.

Old version of the login view is no longer needed
Renamed DemoView to LoginView.

Works!
Merge remote-tracking branch 'origin/master'

Conflicts:
	ycp-cs320-project-ui/.classpath
Added RPC for ApparatusService.

Apparatus view now loads details about fire apparatus from objects
stored in database.
If apparatus DB object is null, return new arrayList
merged changes with josh