Merge branch 'master' into 'Omar'

# Conflicts:
#   AmpScan/ampVis.py
#   GUIs/AmpScanGUI.py
4 jobs for Omar in 25 seconds (queued for 1 second)
latest