Merged menus
Merge pull request #170 from sylvaindeloux/2.3-develop

Merged menus