Fix of MRJ integration when running with jdk 1.7.
Cleanup.
temporary patch to fix NPE when streaming on Wi-Fi, this should be removed and initializeDisplayText() should probably be made into an abstract method.
extensions for docx and apks added to media types
Merge branch 'master' into 5.5.3
Merge branch 'master' of https://github.com/frostwire/frostwire-desktop
Merge branch '5.5.3' of https://github.com/frostwire/frostwire-desktop into 5.5.3
merge