Mentor Button fix
Merge remote-tracking branch 'genshyft/master'
Merge pull request #135 from glenwks/master

Mentor Button Fix