DG-Modify files
DG-Server initialization.
Merge branch 'master' into javaService