the changes from 86940 weren't worth keeping. Would probably just start over.


git-svn-id: https://source.sakaiproject.org/contrib/evaluation/branches/EVALSYS-1413@86946 fdecad78-55fc-0310-b1b2-d7d25cf747c9
merging EVALSYS-1401 and EVALSYS-1406


git-svn-id: https://source.sakaiproject.org/contrib/evaluation/branches/EVALSYS-1413@86947 fdecad78-55fc-0310-b1b2-d7d25cf747c9