Add config fragment for new i18n ordering system
Respecting model permissions in AssetAdmin
Simplified travis builds (external setup scripts)
composer/installers dep workaround

Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
Merge remote-tracking branch 'origin/2.4' into 3.0

Conflicts:
	.travis.yml
	composer.json
Update github path
Add default params to _t() calls to ensure if a translation isn't found, it falls back to a useful English string
Merge pull request #751 from madmatt/fix_for_cms_issue_750

Fix Issue #750
Merge pull request #259 from chillu/pulls/perms-opt-in

FIX: Respect model permissions in AssetAdmin
FIX Correct page title shown when restoring a page, instead of html of tree node
Merge pull request #755 from patbolo/restored-page-correct-title

FIX Correct page title shown when restoring a page, instead of html of t...
Revert call to setCheckModelPermissions()
Merge pull request #186 from silverstripe-rebelalliance/api/translation_priority

Add config fragment for new i18n ordering system
BUG Fixing regression from silverstripe/sapphire/67d1327

Status flag classes didn't pick up styling because the flag was
changed to prefix "status-".
FIX #651 Broken redirection after creating new folder in assets
Merge pull request #756 from halkyon/status_flag_class_fix

BUG Fixing regression from silverstripe/sapphire/67d1327
Merge pull request #757 from mparkhill/651-assets-broken-redirection

FIX #651 Broken redirection after creating new folder in assets
Merge remote-tracking branch 'origin/3.0' into 3.1

Conflicts:
	javascript/CMSMain.Tree.js
Allow asset admin styles to be used in 'Choose another file' dialogue of UploadField

I've added thumbnails to the 'Choose another file' dialogue, this style change allows for that gridfield to be styled the same way with compact rows
Reflect changes in scss file