Changed websockets to use WebSocketHandlers instead of EndPoints.
Merge branch 'spring4.0.x' of https://github.com/WISE-Community/WISE into spring4.0.x