ras
fixing bug
computign mu in intersect
updating body
fixing confict
Merge branch 'master' of https://github.com/pylayers/pylayers
bug fix + various improvments
Merge branch 'master' of https://github.com/pylayers/pylayers

Conflicts:
	pylayers/antprop/antenna.py
	pylayers/antprop/channel.py
fixing bug in importsn
change in antenna
add simultraj
Merge branch 'master' of https://github.com/mmhedhbi/pylayers into meriem

Conflicts:
	pylayers/antprop/antenna.py
modif in simultraj
theta phi modified in antenna only 1 axe
Merge branch 'master' of https://github.com/pylayers/pylayers