Upgrade packages
Refactor app.php
Merge remote-tracking branch 'origin/master' into change-integration

Conflicts:
	composer.json
	composer.lock