Replaced spinbox with text (fix for ID23-1)
Merge pull request #2 from olofsvensson/1.0

Replaced spinbox with text
change energy first, then change resolution (fixes MXSUP-1550)
Merge branch '1.0' into autocentring