init DataServer
Merge branch 'develop'