Merge branch 'master' into 'devel'

# Conflicts:
#   include/publisher_falko.h
#   include/publisher_laser_map.h
#   include/publisher_odom_icp.h
#   include/subscriber_laser2d.h
#   src/publisher_falko.cpp
#   src/publisher_laser_map.cpp
#   src/publisher_odom_icp.cpp
#   src/subscriber_laser2d.cpp