few modifs
Merge branch 'master' of https://github.com/JBCity/jbcity

Conflicts:
	deliverables/version2/city.log
	deliverables/version2/mayor.log
Merge branch 'master' of https://github.com/JBCity/jbcity
Merge branch 'master' of https://github.com/JBCity/jbcity