updated alerts to include alert links
Merge branch 'master' into kingman