new
relation for location page completed
sortable table
minor
removed table from location
minor currency formatting
minor currency change
merge conflicts
merge conflicts
Merge branch 'master' into branchD
updated views