further form changes
Merge branch 'master' of github.com:thesgc/chembiocrunch

Conflicts:
	chembiocrunch/workflow/models.py