Refonte

refonte a partir d'un helloworld
Refont2

encore un commit
Ajout de toutes les saisie des cartes

As, roi, dix,dame,9,8,7
Merge branch 'master' of https://github.com/nipp/playProject

Conflicts:
	app/controllers/Application.java
	app/views/hello.scala.html
	project/target/resolution-cache/default/playproject-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.properties
	project/target/resolution-cache/default/playproject-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.xml
	project/target/resolution-cache/reports/default-playproject-build-compile-internal.xml
	project/target/resolution-cache/reports/default-playproject-build-compile.xml
	project/target/resolution-cache/reports/default-playproject-build-docs.xml
	project/target/resolution-cache/reports/default-playproject-build-optional.xml
	project/target/resolution-cache/reports/default-playproject-build-plugin.xml
	project/target/resolution-cache/reports/default-playproject-build-pom.xml
	project/target/resolution-cache/reports/default-playproject-build-provided.xml
	project/target/resolution-cache/reports/default-playproject-build-runtime-internal.xml
	project/target/resolution-cache/reports/default-playproject-build-runtime.xml
	project/target/resolution-cache/reports/default-playproject-build-scala-tool.xml
	project/target/resolution-cache/reports/default-playproject-build-sources.xml
	project/target/resolution-cache/reports/default-playproject-build-test-internal.xml
	project/target/resolution-cache/reports/default-playproject-build-test.xml
	project/target/streams/$global/update/$global/out
	project/target/streams/$global/update/$global/output
	target/scala-2.10/cache/playproject/compile/play_instrumentation
	target/scala-2.10/cache/playproject/global/copy-assets
	target/scala-2.10/classes/Routes$$anonfun$documentation$1.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$1$$anonfun$apply$1.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$1.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$2$$anonfun$apply$2.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$2.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$3$$anonfun$apply$3.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$3.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1.class
	target/scala-2.10/classes/Routes$.class
	target/scala-2.10/classes/Routes.class
	target/scala-2.10/classes/application.conf
	target/scala-2.10/classes/controllers/Application.class
	target/scala-2.10/classes/controllers/ReverseApplication.class
	target/scala-2.10/classes/controllers/ReverseAssets.class
	target/scala-2.10/classes/controllers/javascript/ReverseApplication.class
	target/scala-2.10/classes/controllers/javascript/ReverseAssets.class
	target/scala-2.10/classes/controllers/ref/ReverseApplication$$anonfun$index$1.class
	target/scala-2.10/classes/controllers/ref/ReverseApplication.class
	target/scala-2.10/classes/controllers/ref/ReverseAssets$$anonfun$at$1.class
	target/scala-2.10/classes/controllers/ref/ReverseAssets.class
	target/scala-2.10/classes/controllers/routes$javascript.class
	target/scala-2.10/classes/controllers/routes$ref.class
	target/scala-2.10/classes/controllers/routes.class
	target/scala-2.10/classes/public/stylesheets/main.css
	target/scala-2.10/classes/routes
	target/scala-2.10/classes/views/html/index$$anonfun$f$1.class
	target/scala-2.10/classes/views/html/index$.class
	target/scala-2.10/classes/views/html/index.class
	target/scala-2.10/classes/views/html/main$$anonfun$f$1.class
	target/scala-2.10/classes/views/html/main$.class
	target/scala-2.10/classes/views/html/main.class
	target/scala-2.10/classes_managed/Routes$$anonfun$documentation$1.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$1$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$1.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$2$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$2.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$3$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$3.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1.class
	target/scala-2.10/classes_managed/Routes$.class
	target/scala-2.10/classes_managed/Routes.class
	target/scala-2.10/classes_managed/controllers/ReverseApplication.class
	target/scala-2.10/classes_managed/controllers/ReverseAssets.class
	target/scala-2.10/classes_managed/controllers/javascript/ReverseApplication.class
	target/scala-2.10/classes_managed/controllers/javascript/ReverseAssets.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseApplication$$anonfun$index$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseApplication.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseAssets$$anonfun$at$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseAssets.class
	target/scala-2.10/classes_managed/views/html/index$$anonfun$f$1.class
	target/scala-2.10/classes_managed/views/html/index$.class
	target/scala-2.10/classes_managed/views/html/index.class
	target/scala-2.10/classes_managed/views/html/main$$anonfun$f$1.class
	target/scala-2.10/classes_managed/views/html/main$.class
	target/scala-2.10/classes_managed/views/html/main.class
	target/scala-2.10/src_managed/main/controllers/routes.java
	target/scala-2.10/src_managed/main/routes_reverseRouting.scala
	target/scala-2.10/src_managed/main/routes_routing.scala
	target/scala-2.10/src_managed/main/views/html/index.template.scala
	target/scala-2.10/src_managed/main/views/html/main.template.scala
	target/streams/$global/playCopyAssets/$global/out
	target/streams/$global/update/$global/inputs
	target/streams/$global/update/$global/out
	target/streams/$global/update/$global/output
	target/streams/compile/compile/$global/export
	target/streams/compile/copyResources/$global/copy-resources
	target/streams/compile/copyResources/$global/out
	target/streams/compile/exportedProducts/$global/export
	target/streams/compile/incCompileSetup/$global/inc_compile
	target/streams/runtime/exportedProducts/$global/export
	target/streams/runtime/internalDependencyClasspath/$global/export
Merge branch 'master' of https://github.com/nipp/playProject