-fixing several things
Merge branch 'master' of
https://github.com/Redoxee/city_creator_esgi.git

Conflicts:
	CityGenerator/Sources/Area.py
	CityGenerator/Sources/Building.py
	CityGenerator/Sources/City.py
	CityGenerator/Sources/District.py
	CityGenerator/Sources/Field.py
	CityGenerator/Sources/FieldClipper.py
	CityGenerator/Sources/Main.py
	CityGenerator/Sources/ManhattanClipper.py
	CityGenerator/Sources/Network.py
	CityGenerator/Sources/Park.py
	CityGenerator/Sources/Road.py