Removed commented code.
Added fix for leaving rings there if diffraction is locked.
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git
Additional fix for keeping diffraction rings.