add location to properties dialog
merge upstream/master
add location property again
Merge pull request #1163 from sunglim/location_property

add location to properties dialog