Merge remote-tracking branch 'drew/master'
added basic layout of a main page view
Added a scroll panel with multiple flowPanels to show multiple apparatus
here are my changes
Merge remote-tracking branch 'Josh/master'

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

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

Conflicts:
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ApparatusView.java
updated the calendar
Merge remote-tracking branch 'Drew/master'
Merge remote-tracking branch 'Drew/master'
Added scroll panel details
Merge remote-tracking branch 'Josh/master'

Conflicts:
	ycp-cs320-project-controllers/src/edu/ycp/cs320/controllers/GetApparatusController.java
	ycp-cs320-project-ui/.classpath
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ApparatusView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/FormView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/LoginView.java
update
Fixed the errors
updated FormView