Minor refactor.
Merged frostwire-common changes
Merge branch 'master' into searchinput