Edits from the meeting today
Merge branch 'master' of https://github.com/DOOOOOM/jmpd-shared

merging