Merge pull request #167 from michaelhidalgo/3.6_Dev

Fixing Issue https://github.com/TeamMentor/TM_4_0_Design/issues/122
Fixing Issue_122
Adding a safe check to determine if the TEAM Mentor URL is null.
Merge pull request #168 from michaelhidalgo/Issue_122_EmailSent_Url

Fixing Issue_122