version bump submodule
fix merge conflict
add remove primitive to the resource
Merge pull request #38 from rackerjoe/master

Merged automatically by jenkins after successful build test