cronograma
cambios cronograma, estadistica en novedades
estadistica con lazybox
Merge branch 'master' of https://github.com/lindalizeth/PROYECTO

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/models/incidente.rb
	app/views/incidentes/index.html.erb
	app/views/layouts/_footer.html.erb
	db/schema.rb