big merge
Merge branch 'master' of github.com:imagecms/ImageCMS

Conflicts:
	application/modules/shop