Removed the scaler view's temporary spot. Changed the max height on the manipulator move from 40 to 50.
Merge branch 'master' of github.com:acquaman/acquaman
Changed the Nitrogen fast scan settings for Jay.
Fixed merge issues. The SGMBeamline had the hacked scalerView removed. The SGMPeriodicTable has a much simpler constructor now.
Merge branch 'master' of github.com:acquaman/acquaman
Merge branch 'master' of github.com:acquaman/acquaman
Changed the location of the temporary save path for the config file.
Merge branch 'master' of github.com:acquaman/acquaman
Fixed simple merge conflict in SGMXASDacqScanController between two different places to save a temporary configuration file.
Merge branch 'master' of github.com:acquaman/acquaman
Tweaking the moveStartTolerance for the exit slit gap.
Merge branch 'master' of github.com:acquaman/acquaman
Merge branch 'master' of github.com:acquaman/acquaman
Fixed merge conflict on the exit slit gap moveStartTolerance.
Merge branch 'master' of github.com:acquaman/acquaman
Merge branch 'master' of github.com:acquaman/acquaman
Merge branch 'master' of github.com:acquaman/acquaman
Merge branch 'master' of github.com:acquaman/acquaman
Merge branch 'master' of github.com:acquaman/acquaman
Merge branch 'master' of github.com:acquaman/acquaman