Merge pull request #40 from briandeheus/develop

Correct response for content-type json
Merge branch 'master' of https://github.com/voltrue2/gracenode
Merge branch 'develop'
Merge branch 'develop'