Don't encode html entities in json response
Don't manually construct JSON. Also, don't encode html entities before json_encode-ing
Merge branch 'refs/heads/master' into 145-2-do-not-html-encode-json-response
Merge branch 'refs/heads/master' into 145-2-do-not-html-encode-json-response

Conflicts:
	classes.fields.php
cherry pick trim whitespace
Merge branch 'refs/heads/master' into 145-2-do-not-html-encode-json-response
Merge pull request #169 from humanmade/145-2-do-not-html-encode-json-response

Do not html encode json response