Put info in app.json
Fixed the typos
Merge branch 'master' into unstable
Merge branch 'unstable'