JSON 1.0
Merge branch 'master' of https://github.com/franckRicart/WebPlayer.git