Merge remote-tracking branch 'wamberg/feature/structural_refactor'
Merge remote-tracking branch 'origin/master'
change string concatenated DOM to use jquery to reduce the risk of XSS