no changes
Merge branch 'template_manager' of github.com:imagecms/ImageCMS into template_manager
conflicts