Modification de la méthode ToJSON
Merge branch 'master' of https://github.com/JasonConard/ProjetCaw-2014