Merge pull request #150 from robotics-in-concert/make_a_map

QT library
Merge branch 'indigo' into make_a_map