style category page
Merge branch 'master' of https://github.com/sonnv/project03

Conflicts:
	app/design/frontend/default/training/template/catalog/product/list.phtml