Merge branch 'groovy-devel' into groovy
Run catkin_generate_changelog, catkin_tag_changelog, bump version to 0.7.0