Index locations and contacts. Refactor event properties code now that categories,contacts and locations are being handled in the same way - again.

Change "name" contact property to be "cn" as we need to use name for entity name.