Add webapi server
Merge branch 'feature/webapi' into develop