added table of alerts to alert.jsp
bugfixes
Merge remote-tracking branch 'origin/alerts'
update