Bug 1020523 - Revert resources to teach
Bug 1020523 - Add mentor
Merge pull request #777 from k88hudson/1020523

Bug 1020523 - Revert resources to teach