Fix bug in trajectory.resample which caused crash when resample time was
overtaking the original bounds
add Alex
Merge branch 'master' of github.com:pylayers/pylayers

Conflicts:
	data/ini/Alex.ini
bug fix in simultraj