Simplified travis builds (external setup scripts)
Require cms in 2.4 composer.json (which is used in travis)
Less trademark-encumbered doc icons (fixed #1787)

Thanks to http://p.yusukekamiyamane.com/
Merge remote-tracking branch 'origin/2.4' into 3.0

Conflicts:
	.travis.yml
	composer.json