Initial commit for the server
Merge branch 'master' into develop