front
Merge branch 'development' of github.com:imagecms/ImageCMS into development
Merge remote-tracking branch 'origin/development' into RC

Conflicts:
	application/modules/shop