markerclusterer
Arreglado principal
Añadido gitignore del sublime
Merge branch 'master' into DetalleEvento

Conflicts:
	protected/controllers/DetalleEventoController.php
	protected/controllers/SiteController.php
	protected/views/detalleEvento/Index.php
	themes/bootstrap/views/site/index.php