updated composer.json
fixed aoutload directory
Merge remote-tracking branch 'refs/remotes/origin/2.3.x'

Conflicts:
	composer.json