generalize the JSON reader
fix conflict
Merge branch 'master' of https://github.com/tog000/appathon_athena