añadido clustering y bounding client-side
Merge branch 'master' of https://github.com/fmayoral/felicimap

Conflicts:
	app/assets/stylesheets/application.css.scss