closes #499
closes #495
Merge branch '1.1' of https://github.com/pagelines/DMS into 1.1