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

Conflicts:
	composer.json
Merge branch 'develop' into hotfix/phpunit
renaming bootstrap
renaming bootstrap
renaming bootstrap
renaming bootstrap
fixing test
fixing test
fixing test
fixing test
Merge branch 'hotfix/phpunit'