Test brancha
test marge
Merge branch 'master' into gm

Conflicts:
	src/Adt/AdtBundle/Resources/views/Patient/index.html.twig
test
Merge remote-tracking branch 'ADT/gm'
marge test
Merge remote-tracking branch 'ADT/gm'
Merge remote-tracking branch 'ADT/master' into gm

Conflicts:
	README
dfdf