Send move stuff
Merge branch 'develop' of https://github.com/kubasub/chinese-checkers into feature/Networking

Conflicts:
	android-application/ChineseCheckers/src/main/java/ca/brocku/chinesecheckers/network/spice/ApiRequest.java
	server/server-application/backend-api-server/logs/application.log
	server/server-application/backend-api-server/project/target/resolution-cache/default/backend-api-server-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.properties
	server/server-application/backend-api-server/project/target/resolution-cache/default/backend-api-server-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-compile-internal.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-compile.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-docs.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-optional.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-plugin.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-pom.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-provided.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-runtime-internal.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-runtime.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-scala-tool.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-sources.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-test-internal.xml
	server/server-application/backend-api-server/project/target/resolution-cache/reports/default-backend-api-server-build-test.xml
	server/server-application/backend-api-server/project/target/streams/$global/update/$global/out
	server/server-application/backend-api-server/project/target/streams/$global/update/$global/output
	server/server-application/backend-api-server/target/resolution-cache/default/backend-api-server_2.10/1.0-SNAPSHOT/resolved.xml.properties
	server/server-application/backend-api-server/target/resolution-cache/default/backend-api-server_2.10/1.0-SNAPSHOT/resolved.xml.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-compile-internal.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-compile.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-docs.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-optional.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-plugin.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-pom.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-provided.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-runtime-internal.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-runtime.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-scala-tool.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-sources.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-test-internal.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-test.xml
	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/routes$javascript.class
	server/server-application/backend-api-server/target/scala-2.10/classes/controllers/routes$ref.class
	server/server-application/backend-api-server/target/scala-2.10/classes/controllers/routes.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/$global/update/$global/out
	server/server-application/backend-api-server/target/streams/$global/update/$global/output
	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
Merge branch 'develop' of https://github.com/kubasub/chinese-checkers into feature/Networking

Conflicts:
	android-application/ChineseCheckers/src/main/java/ca/brocku/chinesecheckers/OnlineListActivity.java
	android-application/ChineseCheckers/src/main/java/ca/brocku/chinesecheckers/gamestate/NetworkPlayer.java
	server/server-application/backend-api-server/logs/application.log
	server/server-application/backend-api-server/target/resolution-cache/default/backend-api-server_2.10/1.0-SNAPSHOT/resolved.xml.properties
	server/server-application/backend-api-server/target/resolution-cache/default/backend-api-server_2.10/1.0-SNAPSHOT/resolved.xml.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-compile-internal.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-compile.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-docs.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-optional.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-plugin.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-pom.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-provided.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-runtime-internal.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-runtime.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-scala-tool.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-sources.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-test-internal.xml
	server/server-application/backend-api-server/target/resolution-cache/reports/default-backend-api-server_2.10-test.xml
	server/server-application/backend-api-server/target/scala-2.10/cache/backend-api-server/compile/play_instrumentation
	server/server-application/backend-api-server/target/streams/$global/update/$global/out
	server/server-application/backend-api-server/target/streams/$global/update/$global/output
	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
logic for registering gcmId