Merge branch 'release/1.2.91'
Merge branch 'release/1.2.10'
undo avoid changeset spam as it breaks functionality
Merge pull request #1736 from ether/dont-avoid-spam

undo avoid changeset spam as it breaks functionality
Merge pull request #1737 from ether/develop

Patch allow spam to be sent :|
Update .travis.yml
Update .travis.yml
update connect and express
Merge branch 'develop' of github.com:ether/etherpad-lite into update-connect
Merge pull request #1739 from ether/update-connect

Update connect and express
Refactor SocketIORouter
catch error on export
Merge pull request #1743 from ether/dont-crash-on-export-abiword

catch error on export
Merge pull request #1745 from ether/master

Pull tags
still express is stuck at 3.1.0
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
Add a server-side changeset queue per pad

fixes #1573
Don't block changeset queue with delivering changeset
Fix authorship sanitization

author colors wouldn't get disttributed, if their id was greater than 9
(due to apool encoding them to base 36)
Remove console.log in content collector

fixes #1731