Update JsonToFile.java
update toJson
Update CharacterTest.java
Ajout web.xml
Merge branch 'master' of https://github.com/JasonConard/ProjetCaw-2014 into brancheinterface
Merge branch 'brancheinterface' of https://github.com/JasonConard/ProjetCaw-2014 into brancheinterface
fusion client serveur