slight change
Merge branch 'bsp' of github.com:dementrock/trajopt into bsp

Conflicts:
	src/bsp/belief_func.hpp
fixed weak ptr issue