Use own satis server
Merge branch 'master' into phase-org

Conflicts:
	composer.json
	composer.lock
Update component versions for release