before bugs
merg
test category tpl added and some exchange script fixes
Merge branch 'template' of github.com:imagecms/ImageCMS into template
shop commit
fixes
fixes
merge with TML