Updated view 1 modal, still needs to save the changed criterions.
Merge branch 'master' of https://github.com/salient-systems/progress-workbook

Conflicts:
	app/assets/stylesheets/style.css
fixed