xml files
Merge branch 'master' of https://github.com/technomaniac/nuvo_qc
git ignore
changes in vendor model
Merge branch 'master' of https://github.com/technomaniac/nuvo_qc
Merge branch 'master' of https://github.com/technomaniac/nuvo_qc

Conflicts:
	.gitignore
	apps/awb/models.py
Merge branch 'master' of https://github.com/technomaniac/nuvo_qc