main fix
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/template'
Main.tpl
fix
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Merge branch 'master' of github.com:imagecms/ImageCMS into template