Fix for 'Issue_413'.
Merge branch 'master' into #413

Conflicts:
	Web Applications/TM_Website/bin/SecurityInnovation.TeamMentor.Website.dll
	Web Applications/TM_Website/bin/TeamMentor.CoreLib.dll
Merge pull request #17 from IanIan123/#413

Fix for 'Issue_413'.