Fixed a bug in acquamanCommon.pri where it wasn't using defined paths for the source directory.  This prevented acquamanCommon from finding the files it needed to build the API.  This has been fixed.  Made a small change in VESPERSAcquaman by removing a lot of extra whitespace from the end of the file.
Merge branch 'master' of github.com-acquaman:acquaman/acquaman
Got a start on AM3DDacqScanController.  Not quite finished, but everything is buildable with a few warnings.  Did some code cleanup in AM2DDacqScanController.
Fixed minor merge conflict in spacing.
Merge branch 'master' of github.com-acquaman:acquaman/acquaman
Merge branch 'master' into SCUpgrade