Fixing Issue_592
Merge remote-tracking branch 'remotes/upstream/3.4_Release' into Issue_592

Conflicts:
	Web Applications/TM_Website/TBot/Views/User_Edit.cshtml
Merge pull request #103 from michaelhidalgo/Issue_592

Issue 592