fixed merge issue with master for page.js
Merge branch 'pluginUI' of https://github.com/scrollback/scrollback into pluginUI