Work
Merge branch 'dev' of https://github.com/shbodya/rpit_desk into dev

Conflicts:
	README
	README~
	app/controllers/incidents_controller.rb~
	app/views/incidents/index.html.erb~
	config/routes.rb~

Some fix