resolve merge conflict
Merge branch 'master' of github.com:Bitmessage/PyBitmessage