Merge pull request #91 from TeamMentor/master

Aligning 3.4_Release with master
Fixing Issue_534
Fixing Issue_407
Fixing Issue_474 : The original fix was applied just to the main login page and the change was not applied here. Therefore I'm duplicating it.
Merge pull request #93 from michaelhidalgo/Issue_534

Fixing Issue 534
Merge pull request #94 from michaelhidalgo/Issue_407

Fixing Issue_407
Merge pull request #95 from michaelhidalgo/Issue_474

Issue 474
Merge pull request #96 from TeamMentor/3.4_Release

3.4 release