Finished preparing travis for releasing
Merge branch 'release/1.4.0' of https://github.com/ArthurHlt/etherpad-lite into release/1.4.0

Conflicts:
	.travis.yml