Fixing Issue  https://github.com/TeamMentor/Master/issues/877
Merge pull request #157 from michaelhidalgo/3.5_Dev

Fixing Issue  https://github.com/TeamMentor/Master/issues/877