Merged menus
Revert "Merged menus"

This reverts commit e8ce409d78ac19c79c972915c4e425b1b32d864a.
Merge pull request #155 from sylvaindeloux/SONATA-379

Merged menus
Merge pull request #156 from sylvaindeloux/SONATA-379

Revert "Merged menus"
Merge branch 'sonata-project/master'