f
Merge branch 'master' of https://github.com/holdera/HealthApp

Conflicts:
	Symfony/app/cache/dev/appDevUrlGenerator.php.meta
	Symfony/app/cache/dev/profiler/index.csv
	Symfony/app/logs/dev.log