Done with listing.
Merge branch 'CatalogXlsParser' of https://github.com/nghiank/ComOn into CatalogXlsParser

Conflicts:
	public/js/controllers/catalogListCtrl.js
	public/views/Catalog/catalogList.html