se agregan  fixtures a los modulos
Merge branch 'master' of https://github.com/inodata/flora.git

Conflicts:
	composer.lock