added gmock
Merge branch 'master' of github.com:ethz-asl/gmock_catkin