maxcount and order fixed
friday
Merge branch 'template' of github.com:imagecms/ImageCMS into template

Conflicts:
	templates/new_shop_template/shop/order_view.tpl
Merge branch 'template'

Conflicts:
	application/modules/shop
	templates/new_shop_template/shop/product.tpl