Include dialog.js in vendor.js
Merge branch 'dev'