useless
Merge branch 'master' of https://github.com/greggz/projet-genielog.git
Merge branch 'master' of https://github.com/greggz/projet-genielog.git
merge
Merge branch 'master' of https://github.com/greggz/projet-genielog

Conflicts:
	src/ui/ConsultModifyInvestigatorWindow.java
	src/ui/CreateCorpsWindow.java
	src/ui/CreateInvestigatorTitleWindow.java
	src/ui/CreatePlaceWindow.java
	src/ui/CreateServiceWindow.java