solve osm parser bug
Merge branch 'master' of https://github.com/pylayers/pylayers

Conflicts:
	pylayers/gis/osmparser.py
Merge branch 'master' of https://github.com/pylayers/pylayers
Merge branch 'master' of https://github.com/pylayers/pylayers
Merge branch 'master' of https://github.com/pylayers/pylayers
Merge branch 'master' of https://github.com/pylayers/pylayers
Merge branch 'master' of https://github.com/pylayers/pylayers
Merge branch 'master' of https://github.com/buguen/pylayers
Merge branch 'master' of https://github.com/niamiot/pylayers
Merge remote-tracking branch 'bernard/master'
Merge branch 'master' of https://github.com/buguen/pylayers
Merge branch 'master' of https://github.com/niamiot/pylayers
Merge branch 'master' of https://github.com/pylayers/pylayers
Merge branch 'master' of https://github.com/niamiot/pylayers
Merge branch 'master' of https://github.com/pylayers/pylayers
Merge branch 'master' of https://github.com/pylayers/pylayers
Merge branch 'master' of https://github.com/pylayers/pylayers
Merge branch 'master' of https://github.com/pylayers/pylayers
Merge branch 'master' of https://github.com/pylayers/pylayers
Merge branch 'master' of https://github.com/pylayers/pylayers

Conflicts:
	pylayers/antprop/antenna.py