Add config fragment for new i18n ordering system
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 #186 from silverstripe-rebelalliance/api/translation_priority

Add config fragment for new i18n ordering system
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
Updated translations
Merge remote-tracking branch 'origin/3.0' into 3.1
BUG: fixed "regression" inserted with 9281ebc64764a58f86f685f9765e1d8b60995e5a adding a new class to SiteTree elem (edit-disabled)
Don't show "edit tree" in list view (fixes #627)
Add generic notice class to filter panels

* Added cms-notice class to filter panels for easier reuse of styles
Merge pull request #764 from adrexia/filter-class

Add generic notice class to filter panels
Behat: Auto-publishing SiteTree fixtures, RedirectorPage fixtures

They can be unpublished through an explicit step.
Extending from base FeatureContext in order to easily
share the same FixtureFactory but still add new blueprints to it.
Behat: Replace @database-defaults with explicit fixtures
Behat: Fixed spelling in test