commit before group pull
resolved conflicts
fixed google map search issue
Merge pull request #28 from tbuchanan/master

pull please