more testing
Merge branch 'web_refactor' of https://github.com/Sijmen/Alitheia-Core into web_refactor