Finished requirement 5 and 6. Merged Nevans code (untested), updated jsps to point to new controller class, fixed classpath issue
fixed project properties issues