clear some files
Push ki Base
imagebox
Merge branch 'master' of github.com:imagecms/ImageCMS

Conflicts:
	application/modules/shop
Product max count fix
Merge remote-tracking branch 'origin/master'
fix commponents list
check fix
Merge branch 'master' of github.com:imagecms/ImageCMS into template