New code
Merge branch 'master' of github.com:duyluong89/ecbc

Conflicts:
	app/code/community/Trego/Ajaxfilter/Block/Ajax.php
	app/code/community/Trego/Ajaxfilter/Block/Catalog/Layer/Filter/Price.php
	app/code/community/Trego/Ajaxfilter/Model/Catalogsearch/Layer.php
	app/design/frontend/default/trego/template/catalog/product/view.phtml
	app/etc/modules/Belvg_ColorSwatchPro.xml
	skin/frontend/default/trego/css/configed/settings_default.css
	skin/frontend/default/trego/css/styles.css
	skin/frontend/default/trego/js/mobile-custom.js