prepare for release
Merge pull request #1373 from ether/release/releases-1.2.5

Release/releases 1.2.5
Merge branch 'release/releases-1.2.5'
Merge branch 'master' of github.com:ether/etherpad-lite
Merge branch 'develop' of github.com:ether/etherpad-lite into develop