add dependency to doctrine-fixtures
Merge branch 'master' of github.com:AIOMedia/AIOMedia

Conflicts:
	composer.json