Push Base
Merge branch 'template' of github.com:imagecms/ImageCMS into template
photo
merg
Merge remote-tracking branch 'origin/template'