gros merge
un plus
Merge branch 'master' of https://github.com/bsouffle/cards.git

Conflicts:
	formatter/cards-style.xml
	res/layout/activity_launch_game.xml
	res/layout/activity_select_game.xml
	res/menu/cards.xml
	res/values/strings.xml
	src/com/utc/cards/common/view/CardsContainer.java
	src/com/utc/cards/common/view/impl/CardsActivity.java
	src/com/utc/cards/common/view/impl/FragmentCardsActivity.java
	src/com/utc/cards/games/damedepique/DameDePique.java
	src/com/utc/cards/games/damedepique/DameDePiquePlayerGameActivity.java
	src/com/utc/cards/games/damedepique/DameDePiqueRules.java
	src/com/utc/cards/model/game/AbstractGame.java
	src/com/utc/cards/model/game/Fold.java
	src/com/utc/cards/model/game/IGame.java
	src/com/utc/cards/player/view/AbstractPlayerGameActivity.java
	src/com/utc/cards/table/view/AbstractTableGameActivity.java
	src/com/utc/cards/table/view/TableLaunchGameActivity.java
	src/com/utc/cards/table/view/TableSelectGameActivity.java
petite correction pour sauvegarder l'adresse ip et pour récupérer le
modele courant