licenses temporary
license temp
conflicts
temp
no changes
conflicts
deleting tn
Merge branch 'template_manager' of github.com:imagecms/ImageCMS into template_manager
tm struggle with submodules
submodules...