Merge pull request #1746 from ether/develop

Bring in latest fixes.  No flow included, too much headache.
Merge pull request #1747 from ether/develop

Stop latest Express breaking things
Update SocketIORouter.js

Changed the setting of client.remoteAddress
updated to use settings

updated handler/SocketIORouter.js to use new setting
updated hooks/express.js to use new setting
updated utils/Settings.js to accept new setting
updated settings.json.template so new setting is present
Use rev-parse to get short commit hash

Also ensures unique
Merge branch 'release/1.2.11'
Update README.md
‘Etherpad Lite’ -> ‘Etherpad’
Merge pull request #1862 from codingisacopingstrategy/etherpad-lite-to-etherpad

‘Etherpad Lite’ -> ‘Etherpad’
Merge branch 'pr/1756' into develop

Conflicts:
	src/node/handler/SocketIORouter.js
Update README.md

delete double wordings
Merge pull request #1917 from maixithn/patch-2

Update README.md
use val not value, broken with newer jq
Merge pull request #1919 from ether/make-username-show-properly

use val not value, broken with newer jq
allow author manager to use custom error module
Merge pull request #1920 from ether/allow-err-msg-from-listpadsof-author

allow author manager to use custom error module
Localisation updates from http://translatewiki.net.
do not pass historical author data to read only users
remove white space
Merge pull request #1921 from ether/dont-pass-padid-in-historical-authors

Dont pass padid in historical authors