no message
Merge branch 'Relatives_activity' of https://github.com/maxtile/smap-sekoia-theme-project into Relatives_activity

Conflicts:
	app/src/main/java/com/example/sekoia/app/Relative.java