[VP, TP] added calculator_menu
Merge remote-tracking branch 'origin/Paul'
[VP, TP] merge conflicts