Merge pull request #134 from DLu/hydro

Checkins to reflect the end of Willow Garage
check for CATKIN_ENABLE_TESTING
Merge pull request #136 from bulwahn/hydro-devel

check for CATKIN_ENABLE_TESTING