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

Conflicts:
	app/models/incident.rb

Merge