Pad updated
Merge branch 'feature-etherpad-plugin' into test