Removed:

- #include "acquaman/AM2DDacqScanController.h" as class no longer
exists.
Merge branch 'master' of github.com:acquaman/acquaman