CS Fixes
Merge branch 'master' of github.com:akeneo/pim-community-dev

Conflicts:
	features/Context/NavigationContext.php
Merge branch 'master' of github.com:akeneo/pim-community-dev