Comment & reallocate #14
finish incident logging for devices #14
fix device history display
Merge branch '14-issue'