Undo merge of app.js and vendor.js
Update documentation
Merge branch 'release/0.11.1' into develop