Minor cleanup.
intermediate commit (broken) so I can pull on desktop and test faster.
Merge branch 'master' of github.com:frostwire/frostwire-android
Merged frostwire-common changes