fixed merging issues
added map canvas to index
added lat and lng to businesses
added pins to maps
returning all businesses as json objects
Merge branch 'feature/map_canvas' of https://github.com/josephcoombes/cloverdale into develop
added colored marker pngs
got isotope filtering working on listing divs
got isotope filtering on business listing divs