vendor view
Merge branch 'master' of https://github.com/technomaniac/nuvo_qc

Conflicts:
	nuvoqc/urls.py