Merge dev-voice with dev

dev-voice should merge with dev for developing the midi player in the program