Better blank template handling closes #334
Merge branch 'Dev' of https://github.com/pagelines/DMS into Dev