Merge branch 'master' into develop
updated Jetty WebSocket library
deleted
added Change Log
updated version
updated expressions
Merge branch 'develop'