results template no longer escapes html
Merge remote-tracking branch 'origin/milestone2' into milestone2