merge tian branch
adding stubs for google maps: tests
fixed merge conflict with tian branch