fixing composer autoload
Merge branch 'feature/composer' into develop

Conflicts:
	composer.json