Partie modele
Merge branch 'master' into devgaetan

Conflicts:
	src/src/com/exia/jollyjumper/controller/Splashscreen.java
Resolve conflict
Merge branch 'master' into devgaetan
Avancé classes data
again
Génération  BD
Merge remote-tracking branch 'origin/devgaetan'

Conflicts:
	src/src/com/exia/jollyjumper/controller/Splashscreen.java
	src/src/com/exia/jollyjumper/model/circuit.java
	src/src/com/exia/jollyjumper/model/delivery.java
	src/src/com/exia/jollyjumper/model/deliveryMan.java
	src/src/com/exia/jollyjumper/model/postalPacket.java
	src/src/com/exia/jollyjumper/model/receiver.java