Merge branch 'master' of https://github.com/pylayers/pylayers

Conflicts:
	pylayers/antprop/antenna.py
modif in body and simultraj
Merge branch 'master' of https://github.com/pylayers/pylayers

Conflicts:
	pylayers.egg-info/SOURCES.txt
	pylayers/antprop/antenna.py
	pylayers/simul/simultraj.py
fixing conflict
modif in simutraj to work with the body file format + adding statModel
updating simultraj
modif in trajectory: traj.resample
modif in standard json file replaces inii files
Merge branch 'master' of https://github.com/mmhedhbi/pylayers into meriem

Conflicts:
	pylayers/mobility/trajectory.py
	pylayers/simul/simultraj.py
cleaning statModel.py
fixing conflict in trajectory
documentation of trajectory
Comment  Digital filter class