[bisq-network/bisq-desktop] Sync up with changes from voting branch (#1601)

[Chris Beams]

@ManfredKarrer and I sorted out the merge permissions issue. See https://github.com/bisq-network/bisq-desktop/pull/1605#issuecomment-404095201 for details.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq-desktop/pull/1601#issuecomment-404095307
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20180711/1f547ead/attachment.html>