fixed composer
Merge branch 'master' of github.com:zloyuser/MentemAdminBundle

Conflicts:
	composer.json
composer fix