Cambio de interfaz Nuevo
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/reservacions/index.html.erb
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655