Indigo dev

indigo_dev build.
Merged changes from hydro_dev.
Successfully build and catkin_lint it
@ipa-fxm Please Review
Ah, ok...in the diff view the #else is not shown....ok then...