Hotfix: HTML escaping
Merge branch 'master' into pretesting-v0.1
Version Number
Merge branch 'master' with the 'ours' strategy to make git not merge the version number change
Merge branch 'pretesting-v0.1' into develop