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
done
whatever
Merge branch 'release/1.2.11'
Merge branch 'master' of https://github.com/ether/etherpad-lite into develop
Update README.md
Merge branch 'master' of https://github.com/ether/etherpad-lite into develop
Merge branch 'develop' of https://github.com/ether/etherpad-lite into develop

Conflicts:
	src/static/js/chat.js