merged master into ipa320
Merge branch 'master' into ipa320
Merged: master into review-320 and resolved conflicts
Merge branch 'master' of github.com:ipa320/jenkins_setup into review-320
Merge branch 'ipa320' into review-320
run rosdep install for all ros versions
Merge branch 'master' into review-320