Starting to think out resource mgmt
Merge branch 'master' into dev/resource_mgmt
Joint interfaces now can claim joints
Forgot to add file
sync forked repot