Multiple QC Changes
Merge branch 'master' of https://github.com/12sm/deupy

Conflicts:
	js/main.js
	resource-detail-presentation.html