+ button to discard field
css
Merge branch 'editCatalogItem' of https://github.com/nghiank/ComOn into editCatalogItem
- fixed the bug on sorting
- fixed css