4.12.1

Merge branch 'development' of github.com:imagecms/ImageCMS into devel…

…opment

prep 4.11

4.10

4.9

Merge branch 'development' of github.com:imagecms/ImageCMS into devel…

…opment

Merge remote-tracking branch 'origin/master' into development

Merge remote-tracking branch 'origin/development' into RC

Conflicts:
	application/modules/shop

Merge branch 'master' of github.com:firstrow/ImageCMS