improve Locator class: location storage is class attr now
Merge branch 'fix_store_empty_values' into dev