Merge branch 'master' into dev
Bug in loading the Locations
Further bugs in the Locations UI
Merge branch 'dev'