changed edmanager position to mentor manager
Merge branch 'mentor-manager'
Change ed manager to mentor manager