Terminado en teoria la generacion de facturas por periodo y por familia y el envio de correo con la factura adjunta.
Intento de merge 1
Merge branch 'master' of https://github.com/UnalSoft/acl-grenoble

Conflicts:
	src/main/java/com/unsoft/acl_grenoble/controller/ControleurAssociation.java
	src/main/java/com/unsoft/acl_grenoble/controller/ControleurFamille.java
	src/main/java/com/unsoft/acl_grenoble/model/centre/InscriptionActivite.java
	src/main/java/com/unsoft/acl_grenoble/model/dao/ActiviteDAO.java
	src/main/java/com/unsoft/acl_grenoble/model/dao/EnfantDAO.java
	src/main/webapp/WEB-INF/responsableFamille/gestionEnfant.jsp
	src/main/webapp/WEB-INF/responsableFamille/inscrireEnfant2.jsp
	src/main/webapp/WEB-INF/responsableFamille/inscrireEnfant3.jsp