Merge remote-tracking branch 'alana/master'
added station model
Calendar
Merge remote-tracking branch 'drew/master'

Conflicts:
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/LoginView.java
changed title in HTML
Merge remote-tracking branch 'Josh/master'

Conflicts:
	ycp-cs320-project/src/edu/ycp/CS320/shared/FakeDatabase.java
another commit
Merge remote-tracking branch 'choose_remote_name/master'
Moved User and UserTest back to problem domain project as they were
currently duplicated in both project.

Keep problem domain output of GUI
Moved problem domain classes from GUI to problem domain project

Also added FireApparatus object functionality. Wrote a unit test and
used the fake database classes to store multiple apparatus object in the
database. Test was successful.
added basic layout of a main page view