Almost done with configuration stuff
Merge branch 'master' of https://github.com/DOOOOOM/jmpd-shared

.