fix test/web-app.js, can now handle JSON
Merge remote-tracking branch 'upstream/master'