Assemblement de l'application dans un unique Bundle
Merge branch 'master' of https://github.com/Bastosss77/Geb_project

Conflicts:
	nbproject/project.properties
	nbproject/project.xml