geocoder working
backend logic for search working with ajax
working on conflict
merge fixes
Merge pull request #24 from kahny/maps_branch

Maps branch