internal update
Merge branch 'master' of https://github.com/frostwire/frostwire-desktop into zhCNtrans

Conflicts:
	lib/messagebundles/zh_CN.po
Merge branch 'master' into zhCNtrans
Stage 4 / 5
Stage 4/5 (100% coverage).
Merge pull request #323 from eudaemon01/zhCNtrans

zh_CN.po changed. Stage 4/5 (100% coverage).