view 2 editing complete. except for canceling out of the edit page
Merge branch 'master' of https://github.com/salient-systems/progress-workbook