Push all Base
Push all No conflict Base
fix
Merge branch 'master' of github.com:imagecms/ImageCMS into template
fix
fix
Push fix Base
Push fix Basek
fix
Merge branch 'template' of github.com:imagecms/ImageCMS into template