updated to use the new includes for function menu and characterization menu
updated to use the new includes for function menu and characterization menu


SVN-Revision: 3279

NCIP/cananolab,NCIP/cananolab,NCIP/cananolab