próba komina
Merge branch 'master' into gm

Conflicts:
	src/Adt/AdtBundle/Resources/views/Patient/index.html.twig