Adding defstr3.ini in data
fixing conflict in layout
Merge branch 'master' of https://github.com/pylayers/pylayers

Conflicts:
	pylayers/gis/layout.py