many changes
Merge branch 'master' of github.com:pylayers/pylayers

Conflicts:
	pylayers/antprop/slab.py