Merge branch 'release/1.2.81'
Modified SecurityManager to fix Issue #1262
Merge branch 'master' of github.com:max-weller/etherpad-lite into develop
Merge branch 'develop' of github.com:max-weller/etherpad-lite into develop