no message
Merge branch 'develop' of https://github.com/CST4G/HealthAppSprint2b into develop

Conflicts:
	HealthApp/Controllers/ServicesController.cs