fixed some includes and property definitions
merge with groovy_dev
update xacro file format