prepare for release
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
listAllPads should return an object, not an arraay. issue #1374
Merge pull request #1375 from jhollinger/develop

listAllPads should return an object, not an arraay. issue #1374
listAllPads needs findKeys from ueberDB 0.1.9
Added a template block for #users
Merge pull request #1377 from mluto/add-users-block

Added a template block for #users
Merge pull request #1376 from t-8ch/patch-2

listAllPads needs findKeys from ueberDB 0.1.9
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
bump v and create CHANGELOG
Merge branch 'release/releases-1.2.6'
Merge branch 'release/releases-1.2.6' into develop
Update bin/convert.js

'lil typo
Merge pull request #1383 from disy-mk/patch-2

Patch 2
Localisation updates from http://translatewiki.net.
script tag didn't link to right location
fix issue #1369 where params would break import