Updated composer.json to get the right branch of the package
Merge branch 'feature/facets' into develop

Conflicts:
	composer.json