Some changes.
Merge branch 'editCatalogItem' of https://github.com/nghiank/ComOn into editCatalogItem
Admin can now add types.
Merge branch 'editCatalogItem' of https://github.com/nghiank/ComOn into editCatalogItem

Conflicts:
	public/views/Catalog/view.html