feature B changes
Merge branch 'featureB' into dev

Conflicts:
	DemoApp/DemoApp/Controllers/ValuesController.cs