Merge branch 'master' of https://github.com/dubdabasoduba/DMS into featu...

...re/DMS-1