Fixed UI error.
Merge branch 'Deployment' of https://github.com/nghiank/ComOn into Deployment

Conflicts:
	public/css/common.css
	public/views/Catalog/view.html