fix typo
fix merge bug
missing images from marker update
sort node markers by severity and node label
another merge fix
fix comparator
move comparator to an inner class, more null-checking
Fixed criteria problem where multiple selections were not being OR'd
with each other. Tweaked CSS so that the font on the alarm browser is
normal size.