Ingry proyect
Merge branch 'master' of https://github.com/morenopalacios/SANO

Conflicts:
	Gemfile
	app/assets/stylesheets/bootstrap-theme.min.css
	app/assets/stylesheets/framework_and_overrides.css.scss
	app/controllers/incidentes_controller.rb
	app/helpers/incidentes_helper.rb
	app/models/funcionario.rb
	app/models/incidente.rb
	app/models/tiponovedad.rb
	app/views/funcionarios/index.html.erb
	app/views/incapacidads/show.html.erb
	app/views/incidentes/_form.html.erb
	app/views/incidentes/edit.html.erb
	app/views/incidentes/index.html.erb
	app/views/incidentes/index.json.jbuilder
	app/views/incidentes/new.html.erb
	app/views/incidentes/show.html.erb
	app/views/incidentes/show.json.jbuilder
	app/views/layouts/_navigation.html.erb
	app/views/layouts/_navigation_links.html.erb
	app/views/riesgos/index.html.erb
	app/views/riesgos/show.html.erb
	app/views/tiponovedads/index.html.erb
	config/routes.rb
	db/schema.rb
	test/controllers/incidentes_controller_test.rb
	test/fixtures/incidentes.yml