working on JSON
upgrade play version up to 2.1.3
Merge branch 'master' into work_on_json
upgrade play version up to 2.1.3