additional work on alerts module -- includes initial templating refactoring
Merge remote-tracking branch 'upstream/master'