waiting for DOM ready to draw points in map
Merge branch 'gh-pages'
Updating to Mapbox v1.5.2

Changes in GeoJSON format and adding interaction to markers
Merge branch 'mapbox-update' into gh-pages
Merge branch 'gh-pages' of https://github.com/colaborativa/DisponibleEnCordoba

Conflicts:
	Gemfile
	Gemfile.lock
	js/dec-google_docs.js
	js/dec-principal.js
Adding html tag particular for EspaciosEnDesuso
Adding comments to readme about how to update FORK
Changing mustache template to allow empty fields on marker information
Merge branch 'mapbox-update' into gh-pages
Updating improvements from Origin
Changing way to add markers to avoid random problems
Merge branch 'gh-pages' into mapbox-update
Merge branch 'mapbox-update' of https://github.com/colaborativa/DisponibleEnCordoba
Merge branch 'master' into gh-pages

Conflicts:
	js/dec-principal.js