Refactor views.py
Intermediate commit before merge
Merge branch 'jon'

Conflicts:
	views/qaqc.py