rebase with master
resolve one conflict with master
Merge pull request #86 from robi-y/master

Google maps searchbox #48