corrección de generación de reportes
Merge branch 'master' of https://github.com/jorgeramirez/hackathon

Conflicts:
	app/controllers/items_controller.rb
arregle el menu
Merge branch 'master' of https://github.com/jorgeramirez/hackathon

Conflicts:
	app/assets/javascripts/templates/application.handlebars