Ensuring elastica configuration in injector.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	composer.lock
	themes/addons/templates/Page.ss
Modified AddonUpdater to remove error
Merge branch 'master' of github.com:sunnysideup/extensions.silverstripe.org

Conflicts:
	composer.lock
	themes/addons/templates/Page.ss