Commit inicial rama
Detalle evento terminado (Como opcional añadir view a model)
Borrar 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
Detalle evento terminado (Modal incluido)
Merge branch 'DetalleEvento' of github.com:fawques/CodeSpain into DetalleEvento
Merge branch 'DetalleEvento'