Minor changes to prep for a pull.
Merge branch 'master' of https://github.com/salient-systems/progress-workbook
Finished assessment view 1 edit page.
Merge branch 'master' of https://github.com/salient-systems/progress-workbook