fix #203
fix #204
less stupid dynamicObject.canMove - should fix #111
Merge remote-tracking branch 'upstream/master' into develop