Merge branch 'master' into Feature_90

Conflicts:
	MYProject/Controllers/AboutController.cs