Push fix Base
meny&uploads
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Merge branch 'template' of github.com:imagecms/ImageCMS

Conflicts:
	application/modules/shop