awb model
Merge branch 'master' of https://github.com/technomaniac/nuvo_qc

Conflicts:
	nuvoqc/urls.py.orig
mm
awb model
Merge branch 'master' of https://github.com/technomaniac/nuvo_qc

Conflicts:
	.gitignore
gitignore
Merge branch 'master' of https://github.com/technomaniac/nuvo_qc

Conflicts:
	nuvoqc/urls.py.orig
vv
create userlogin