script change
products tpl
Merge remote-tracking branch 'origin/template'
category swith
Merge remote-tracking branch 'origin/template'
Merge remote-tracking branch 'origin/template'

Conflicts:
	templates/new_shop_template/shop/default/js/scripts.js
	templates/new_shop_template/shop/default/product.tpl
Merge remote-tracking branch 'origin/template'
Merge remote-tracking branch 'origin/template'
nophoto add
Payment System fix and some JS
Merge remote-tracking branch 'origin/template'

Conflicts:
	templates/new_shop_template/shop/default/js/shop.js
order_view dev version
Merge remote-tracking branch 'origin/template'
without changes
Merge branch 'master' of github.com:imagecms/ImageCMS into template
after master pull commit