Issue #2395 JSON doc rewrite
Merge branch 'master' of github.com:kipsigman/playframework