media url setup
Merge branch 'master' of https://github.com/ShaastraWebops/ERP14

Conflicts:
	templates/barcode/upload_csv.html