fix
fix
Push Base
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Merge remote-tracking branch 'origin/template'

Conflicts:
	application/modules/install/sqlShop.sql