Implement a LocationMarker object type on the master branch

This is the master-branch patch analogous to #185, which applies to the harmony branch.