Merge branch 'development'. Add sortable Locations.