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

Conflicts:
	application/modules/install/_install.php
Merge branch 'userstory83' of github.com:imagecms/ImageCMS
install sql partly cleaned
Merge branch 'userstory83' of github.com:imagecms/ImageCMS
merge
product tabs fixed
install examples fixed
fix
aaaa
Remove some Modules
Merge remote-tracking branch 'origin/master'
trash