update etherpad
merge master
update cheffile.lock
Merge remote-tracking branch 'origin/master'