Fiche client : jasper reports
Merge branch 'master' of git@github.com:jerep6/ogi.git

Conflicts:
	ogi-parent/ogi-external-resources/src/main/resources/jasper/fiche_classeur_subreport_photos.jasper