cache
Merge branch 'master' of https://github.com/earthlinkdesign/csp

# By trungjc
# Via trungjc
* 'master' of https://github.com/earthlinkdesign/csp:
  update category layoout

Conflicts:
	cache/com_mijoshop/cache.currency.1415603149
	cache/com_mijoshop/cache.currency.1415747328
	cache/com_mijoshop/cache.currency.1415813328
	cache/com_mijoshop/cache.language.1415601966
	cache/com_mijoshop/cache.language.1415747328
	cache/com_mijoshop/cache.language.1415810530
	cache/com_mijoshop/cache.zone.13.1415602059
	cache/com_mijoshop/cache.zone.13.1415747373
	cache/com_mijoshop/cache.zone.13.1415811919
	components/com_mijoshop/opencart/vqmod/vqcache/vq2-catalog_controller_module_categoryhome.php
	t3-assets/dev/t3/ef883ccf2041c3fc2e5671dc9b4bf4c1-cache-t3-debe22c516ecd93a700d01df70ea0d7d.php
	t3-assets/dev/templates.t3_blank.less.style-responsive.less.css
	t3-assets/dev/templates.t3_blank.less.style.less.css