Add client application
Add server application
Merge branch 'dev'