making json pretty by default
Merge branch 'master' into couple-child-relationship