yan on 4/10-2
Merge branch 'pre-project' of github.com:jakers/static_picola into pre-project
fixed login nullpointer exception by changing UserDAO load User logic
page and navi to exist preparing to test navi back
added mc responses to instructors group view