fixing conflict in antenna.py
updating ANTVSH notebook
Merge branch 'master' of https://github.com/pylayers/pylayers

Conflicts:
	doc/notebook/4-signal/UwbWaveforms.ipynb
	pylayers.egg-info/SOURCES.txt
	pylayers/antprop/antenna.py
	pylayers/mobility/body/body.py
Merge branch 'master' of https://github.com/pylayers/pylayers

Conflicts:
	doc/notebook/4-signal/UwbWaveforms.ipynb
	pylayers.egg-info/SOURCES.txt
	pylayers/antprop/antenna.py
	pylayers/mobility/body/body.py
change in trajectory
Merge branch 'master' into meriem

Conflicts:
	doc/notebook/3-antprop/Antennas.ipynb
	pylayers/antprop/antenna.py
change in build rst add markdown
Merge branch 'master' of https://github.com/mmhedhbi/pylayers into meriem

Conflicts:
	pylayers/mobility/body/body.py
switching branch
Fixing dev ant problem in body
adding 3rd dimension in trajectory
cleaning breakpoint
Merge branch 'meriem'

Conflicts:
	pylayers/mobility/body/body.py