Merge pull request #137 from glenwks/master

add option to edit mentor assignment within team
Merge remote-tracking branch 'upstream2/master'