Merge remote-tracking branch 'drew/master'
added basic layout of a main page view
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
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
updated medical forms in FormView class
Merge remote-tracking branch 'josh/master'
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/.settings/com.google.gdt.eclipse.core.prefs
	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
prototype back button added
404 bug fix
Merge branch 'master' of git@github.com:dho7/ycp-cs320-project.git
FUNCTIONAL BACK BUTTON ON EACH PAGE!!! & possible add user derby method
Merge remote-tracking branch 'Drew/master'
Added scroll panel