PO_016_06:

Minor fix for location selection - removed "Name" locationtype
Merge remote-tracking branch 'origin/master'