Added websocket WebSocketServlet
Merge branch 'feature/websocket' into develop

Conflicts:
	project/Build.scala
Changed package