minor fixes
merge
Merge branch 'master' of https://github.com/ldev6/ManETS_Server
...
merge