css changes
+ functions in matching field
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
+ configure sheet title / data row modal
CSS change on the show/hide
Updated processing of Xls
Merge branch 'editCatalogItem' of https://github.com/nghiank/ComOn into editCatalogItem

Conflicts:
	public/views/Catalog/view.html
+ button to discard field
css
Merge branch 'editCatalogItem' of https://github.com/nghiank/ComOn into editCatalogItem
- fixed the bug on sorting
- fixed css
+ check for compulsory fields in new type declaration
Saving a particular filter as a library.
fixed the html error on flag
Changed user model
Merge branch 'editCatalogItem' of https://github.com/nghiank/ComOn into editCatalogItem
+ change css so pending rows stays on top
changed Processing of XML.
Merge branch 'editCatalogItem' of https://github.com/nghiank/ComOn into editCatalogItem
enforced lower case while uploading.