Trampos now part of the main menu
Merge branch 'trampos-menu' of github.com:bpassos/zofe into bpassos-trampos-menu
Merge branch 'bpassos-trampos-menu'