Changed upload catalog process
Merge branch 'editCatalogItem' of https://github.com/nghiank/ComOn into editCatalogItem

Conflicts:
	public/js/controllers/addCatalog.js
Removed console.logs