included websocket support
commit local changes
Merge branch 'master' of https://github.com/prassee/ScalaJSBattleShipGame

Conflicts:
	gameServer/src/main/scala/server/BattleShipServer.scala