Started work on configure template modal.
Merge branch 'editCatalogItem' of https://github.com/nghiank/ComOn into editCatalogItem

Conflicts:
	public/js/controllers/addCatalog.js
	public/views/Catalog/view.html