Brainweaver progress, CodeToHtml expansion, misc stuff
Merge branch 'develop' of https://github.com/richelbilderbeek/ProjectRichelBilderbeek into develop

Trivial merge