SomeNewFeature6
Merge branch 'SomeNewFeature6'

Conflicts:
	TestApp2/Controllers/HomeController.cs