merging changes
Fixed merge conflict
Added centre of rotation wizard/calculation (currently doesn't set result) and fixed some issues with sample plate position calculation.