Catalog BugFix
Bugfix
Merge branch 'dev'

Conflicts:
	plug/catalog/front/tpl_compile/%%5E^5ED^5EDD270C%%itemPage.tpl.php
	system/admin/tpl_compile/%%72^72B^72B2DBF6%%panel.plugins.view.tpl.php