Changed CheckBoxes to RadioButtons
Merge branch 'LocationSelectionUIChange' into dev