Fix
Update fixtures.
Merge branch 'feature/admin_refactoring' into develop

Conflicts:
	composer.lock