Add: more fields for activeAdmin page
Add: machine handling in incidensController
Change: updated incident json response