Signed-off-by: availlant <vaillant.alexis@hotmail.fr>
Merge branch 'HEAD' of https://github.com/levalidator/GenartFull.git

Conflicts:
	build/classes/com/genart/bdd/AccesBDD.class
Merge branch 'HEAD' of https://github.com/levalidator/GenartFull.git
Merge branch 'HEAD' of https://github.com/levalidator/GenartFull.git

Conflicts:
	build/classes/com/genart/bdd/AccesBDD.class

Signed-off-by: availlant <vaillant.alexis@hotmail.fr>
Merge branch 'HEAD' of https://github.com/levalidator/GenartFull.git

Conflicts:
	src/com/genart/bdd/AccesBDD.java
Merge branch 'HEAD' of https://github.com/levalidator/GenartFull.git

Conflicts:
	src/com/genart/bdd/AccesBDD.java
Signed-off-by: availlant <vaillant.alexis@hotmail.fr>