Join and Delete updated
Fixed JSON
Merge branch 'feature/Networking' of https://github.com/kubasub/chinese-checkers into develop

Conflicts:
	server/server-application/backend-api-server/logs/application.log
	server/server-application/backend-api-server/target/scala-2.10/cache/backend-api-server/compile/play_instrumentation
	server/server-application/backend-api-server/target/scala-2.10/classes/controllers/GameSetupController$$anonfun$delete$1.class
	server/server-application/backend-api-server/target/scala-2.10/classes/controllers/GameSetupController$$anonfun$gamestate$1.class
	server/server-application/backend-api-server/target/scala-2.10/classes/controllers/GameSetupController$$anonfun$join$1$$anonfun$apply$1.class
	server/server-application/backend-api-server/target/scala-2.10/classes/controllers/GameSetupController$.class
	server/server-application/backend-api-server/target/scala-2.10/src_managed/main/controllers/routes.java
	server/server-application/backend-api-server/target/scala-2.10/src_managed/main/routes_reverseRouting.scala
	server/server-application/backend-api-server/target/scala-2.10/src_managed/main/routes_routing.scala
	server/server-application/backend-api-server/target/streams/compile/compile/$global/export
	server/server-application/backend-api-server/target/streams/compile/copyResources/$global/copy-resources
	server/server-application/backend-api-server/target/streams/compile/incCompileSetup/$global/inc_compile