merge in client.es6.js from branch editable