Squeezebox bugs corrections (#1077 + #1082) + some cleaning
Merge pull request #1119 from ichbtm/master

Squeezebox bugs corrections (#1077 + #1082) + some cleaning