Mostly cosmetic changes to file indentation.
Merge branch 'Issue496ToMergeWithSGMRelease' of github.com:acquaman/acquaman into Issue496ToMergeWithSGMRelease
Added features to request loading a specific camera/rotation/samplePlate/beam from the database. Right click on the loadCamera(etc) button and a dialog will pop up. Needs to be fully tested on the OPI.