autoload bug fix 1 by clainatomi
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	api/config/autoload.php