Added omnipay to 2.3 dev
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	composer.json