refactor code
*change nav bar for Funct Overview
*update data for funct overview in viewWillAppear
Merge remote-tracking branch 'origin/master'