displacement averaging inserted
Merge branch 'master' of https://github.com/rosoba/rosoba.git

Conflicts:
	scratch/displ_avg_examples/bt_3pt_2d_mdm.py
update 3PB and NM-Test