without changes
Merge branch 'master' of github.com:imagecms/ImageCMS into template
after master pull commit
deffects#2 [2] fixed
fix
new validation added
kits in order fixed
Merge branch 'template' of github.com:imagecms/ImageCMS into template

Conflicts:
	application/modules/shop
fix
fix