change location logic
Merge pull request #638 from unikent/feature/multiple-locations-ug

change location logic
merge develop