conf
Merge branch 'master' of https://github.com/sem4j/sem4j-viewer