Support JSON in the API
Forgot to commit this
Merge branch 'master' into feature-json-api

Conflicts:
	web/app.py