correcting hard-coded reference to attribute.
moving getLocations() to bottom.
Merge branch 'master' into lyrical-locations_google-doc: accepting nothing.