detalles
mail
mail
Merge remote-tracking branch 'origin/luis'

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
Agregado time_select a eventos