upgrade 2.3
configure 2.3
Merge branch 'master' into uberspace

Conflicts:
	composer.json