fixing conflict in antenna.py
updating ANTVSH notebook
cleaning notebooks
reconciliation of body time and trajectory time in posvel
Merge branch 'master' of https://github.com/pylayers/pylayers
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
add progress to run4
Fpatt is now compliant with show3 methods of Antenna, radionode and
simulem
edit for Fpattern show3
switching branch
Fixing dev ant problem in body
adding 3rd dimension in trajectory
cleaning breakpoint
add a plotd method to Tchannel to siplay angles of arrival or departure
add a reverse option to plotd to invert theta and phi
Merge pull request #196 from niamiot/master

vizualizations of antennas ans aoa/aod fot transmission channel (plod)
Merge branch 'meriem'

Conflicts:
	pylayers/mobility/body/body.py