Fix issues in pull #243

1. pull #242 was not correctly merged.
2. the code "google.loader.ClientLocation;" was not working. Rendering the events screen inoperable. Commented it out.