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

Conflicts:
	app/models/incident.rb

Merge
Update
change the passwd
New file create
More new files
test fix
 added seeds
update files(some were added)
Merge branch 'master' of github.com:shbodya/rpit_desk