new file:   application/project/project/target/config-classes/$3a5a3cf3bdcbd698cffc.cache
	new file:   application/project/project/target/config-classes/$450df8418898037113f3.cache
	new file:   application/project/project/target/config-classes/$df3f2433604f573a4714.cache
	new file:   application/project/target/config-classes/$1699e45ed0616e7f0260.cache
	new file:   application/project/target/config-classes/$37d700f5cafb41652a78.cache
	new file:   application/project/target/config-classes/$4e92280f3d3cb75cd031.cache
Merge branch 'master' of https://github.com/ziellim/Mayor-Pro

Conflicts:
	application/src/main/scala/com/paris7/mayorpro/business/Game.scala
	application/src/main/scala/com/paris7/mayorpro/model/Platform.scala
Merge branch 'master' of https://github.com/ziellim/Mayor-Pro

Conflicts:
	application/project/target/resolution-cache/default/application-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.properties
	application/project/target/resolution-cache/default/application-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.xml
	application/project/target/resolution-cache/reports/default-application-build-compile-internal.xml
	application/project/target/resolution-cache/reports/default-application-build-compile.xml
	application/project/target/resolution-cache/reports/default-application-build-docs.xml
	application/project/target/resolution-cache/reports/default-application-build-optional.xml
	application/project/target/resolution-cache/reports/default-application-build-plugin.xml
	application/project/target/resolution-cache/reports/default-application-build-pom.xml
	application/project/target/resolution-cache/reports/default-application-build-provided.xml
	application/project/target/resolution-cache/reports/default-application-build-runtime-internal.xml
	application/project/target/resolution-cache/reports/default-application-build-runtime.xml
	application/project/target/resolution-cache/reports/default-application-build-scala-tool.xml
	application/project/target/resolution-cache/reports/default-application-build-sources.xml
	application/project/target/resolution-cache/reports/default-application-build-test-internal.xml
	application/project/target/resolution-cache/reports/default-application-build-test.xml
	application/project/target/streams/$global/ivyConfiguration/$global/out
	application/project/target/streams/$global/update/$global/inputs
	application/project/target/streams/$global/update/$global/out
	application/project/target/streams/$global/update/$global/output
	application/project/target/streams/compile/dependencyClasspath/$global/export
	application/project/target/streams/compile/exportedProducts/$global/export
	application/project/target/streams/compile/externalDependencyClasspath/$global/export
	application/project/target/streams/compile/managedClasspath/$global/export
	application/project/target/streams/runtime/dependencyClasspath/$global/export
	application/project/target/streams/runtime/exportedProducts/$global/export
	application/project/target/streams/runtime/externalDependencyClasspath/$global/export
	application/project/target/streams/runtime/fullClasspath/$global/export
	application/project/target/streams/runtime/internalDependencyClasspath/$global/export
	application/project/target/streams/runtime/managedClasspath/$global/export