Fixed corner case bug in fingerprinter parsing of audio samples
Commit the other files too
Merged conflicts between Mike/Gail commits