make order success
Merge branch 'template' of github.com:imagecms/ImageCMS into template
admin product
Merge branch 'template' of github.com:imagecms/ImageCMS into template
recent news widget some fields to select query
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Merge remote-tracking branch 'origin/template'

Conflicts:
	templates/new_shop_template/shop/default/js/shop.js