Added doctrine/data-fixtures and doctrine/DoctrineFixturesBundle to composer.json
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.lock