commit
Merge branch 'develop' of https://github.com/winfel/wa_knowledge_structuring into develop