Added ws server and client (POC)
Merge remote branch 'origin/develop' into develop