fixed error in do_JSON
Merge branch 'master' of https://github.com/heathj/cerebro
Merge branch 'front_end'
Merge branch 'master' into front_end