Commented and added missing features to Location Selection Activity
Merge branch 'LocationSelectionActivity' into dev