add SomeNewFeature2
add SomeNewFeature3
Merge branch 'SomeNewFeature2' into SomeNewFeature3

Conflicts:
	TestApp2/Controllers/HomeController.cs
Merge branch 'SomeNewFeature3' into HotFix1

Conflicts:
	TestApp2/Controllers/HomeController.cs