modi f in layout
Merge branch 'master' of https://github.com/pylayers/pylayers

Conflicts:
	pylayers/gis/layout.py
Fixing bugs in body