git now ignores mp3/wav/ogg formats
Merge remote-tracking branch 'origin/develop' into develop