Update README.md
Merge branch 'master' of github.com:ether/etherpad-lite into develop