Renamed function to avoid conflicts.
Renamed function to avoid conflicts.
Added new echo parameter to avoid premature echoation.
Merge branch 'cnp_nav_menu' into dev
Merge branch 'dev'