Architecture
Architecture et Modeles
Merge changes
.Project
Merge branch 'master' of https://github.com/JBCity/jbcity

Conflicts:

deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/city$$anonfun$di
splay$1$$anonfun$apply$mcVI$sp$2.class

deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/city$$anonfun$di
splay$1.class

deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/city$$anonfun$in
it$1$$anonfun$apply$mcVI$sp$1.class

deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/city$$anonfun$in
it$1.class
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/city.class

deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/infrastructure.c
lass
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/mayor.class
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/network.class