pre-build fixes;
Merge branch 'master' of github.com:imagecms/ImageCMS
Merge branch 'master' of github.com:imagecms/ImageCMS
merge
pre-release
Merge remote-tracking branch 'origin/template'

Conflicts:
	application/modules/install/sqlShop.sql
sql fixed
Merge branch 'master' of github.com:imagecms/ImageCMS

Conflicts:
	application/modules/install/sqlShop.sql
add default fix
Merge remote-tracking branch 'origin/master'
commit
Merge branch 'master' of github.com:imagecms/ImageCMS
add star_rating to comments
Merge remote-tracking branch 'origin/master'
commerce_mobile_fix
impott ninja fix
RC small fix
impott ninja fix
Merge branch 'master' of github.com:imagecms/ImageCMS into template