mod/hotpot fix use of deprecated filter_text
mod/hotpot only apply filters to text outside of html tags
mod/hotpot further improve positioning of elements in JMatch intro output format
CONTRIB-4910 mod/hotpot fix Oracle error: 'duplicate column names userid' on HotPot report pages
Merge pull request #3 from gbateson/master

Merge upstream