merged the gazebo changes from hydro to groovy
Merge pull request #102 from shadow-robot/F_propagate_gazebo_to_groovy

merged the gazebo changes from hydro to groovy