master now 0.6-x
[omnipay] fixes to support 1.0.x of omnipay.
Merge branch '0.5'

Conflicts:
	composer.lock
Merge remote-tracking branch 'origin/0.5'

Conflicts:
	composer.json
	composer.lock
Merge branch '0.5'

Conflicts:
	composer.lock