merge
core updates
update in houdini plugin, added image plugin and updated primitives