Server
Merge branch 'master' of github.com:ybonnel/CodeStoryFinale

* 'master' of github.com:ybonnel/CodeStoryFinale:
  add json datas
Fix compile