Merge pull request #1 from Aomeas/dev

Dev
75% of the xml file for deck
Forgotten files for previous commit
network bases
Merge https://github.com/Aomeas/GameFrameworkDev into dev

Conflicts:
	GameFramework/src/network/Client.java
	GameFramework/src/network/Server.java
corrections tests
règle placement de tuile + début au loup
Merge pull request #2 from Aomeas/lucie

Lucie
Merge branch 'master' of https://github.com/Aomeas/GameFrameworkDev into ao