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

Conflicts:
	app/controllers/reservacions_controller.rb
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/8c2b061e379a23e7c4d207adcf992462
	tmp/cache/assets/development/sprockets/d585a06e2ee6203ccb04c8b84150d14d
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid