New changelist
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/frontend/site_techonline/layouts/CatalogBase.blade.php
	app/views/frontend/site_techonline/layouts/CatalogParts.blade.php
	app/views/frontend/site_techonline/layouts/CatalogSellers.blade.php
	app/views/frontend/site_techonline/layouts/CatalogTech.blade.php