Merge branch 'master' of github.com:imagecms/ImageCMS into template
compareList full completed
subcommit to previous ~
Merge branch 'template' of github.com:imagecms/ImageCMS into template

Conflicts:
	application/modules/shop