PullS
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Pull Base
Merge remote-tracking branch 'origin/template'