versions preparations;
Merge branch 'master' of github.com:imagecms/ImageCMS

Conflicts:
	application/modules/shop
Merge branch 'template' of github.com:imagecms/ImageCMS

Conflicts:
	application/modules/shop
rename template
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/template'
commerce tpl
front
front
lt IE8
front
Merge branch 'master' of github.com:imagecms/ImageCMS
fix
fix