Merge branch 'master' of github.com:rmb-om/autopnp
some changes for Hako demo
Merge branch 'master' of github.com:rmb-om/autopnp into rmb-om-master
Merge branch 'master' into rmb-om-master