Temp location for TeamMentor Master v3.3 (to be merged into master)