Add server
Merge branch 'develop'