Merge branch 'dev' of github.com:cake-tech/cake_wallet_private into btc