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