Implemented the MenuViewController to work properly with popups.
add cancel button in the popup layout
nothing special

Change
Merge remote-tracking branch 'origin/master' into SummaryViewCtrl