Pull new Discount BAse
Merge branch 'template' of github.com:imagecms/ImageCMS into template
lib category get sub categories if there is no cats fixed, in there is no db connection and db_debug off we'll show_error
Merge branch 'template' of github.com:imagecms/ImageCMS into template
empty link in checked filters fixed
product
merg
added validation messages in cart tpl and additional slash form action attribute removed
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Merge remote-tracking branch 'origin/template'

Conflicts:
	templates/new_shop_template/widgets/view_product.tpl