Adding settings
Merge branch 'master' of github.com:andreassolberg/etherpad-lite