Merge branch 'dev' into asher-dev

diff --cc .gitlab-ci.yml
index 05b202e2765a179dfb2f4c0b19453aea669ddb97,301b7fde6d725534fedcb655d13c817e031f6f3d..a842da0daf907ba71d970d8e6f6eac6463b120fe
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -66,7 -65,7 +66,6 @@@ build:linux
        - ${VERUS_CLI_LINUX}
        - ${VERUS_CLI_LINUX}.sha256
      expire_in: 1 week
--
  ########################################################################################################################
  ####END####                                              LINUX                                               ####END####
  ########################################################################################################################

diff --cc doc/man/verus-cli/mac/README.txt
index c1ed1e8e51c38b998b9e9b01486e2fa622891ed5,287b755c7f4bdb63e2980aa1e829ccdc119e07a7..efcc7ade0620916b93c88926ef05b5945c24af0a
--- 1/doc/man/verus-cli/mac/README.txt
--- 2/doc/man/verus-cli/mac/README.txt
+++ b/doc/man/verus-cli/mac/README.txt
@@@ -1,4 -1,5 +1,5 @@@
 -VerusCoin Command Line Tools v0.6.0-PBaaS-Cross-chain-Technology-Preview
 +VerusCoin Command Line Tools v0.5.7
+ Contents:
  verusd - VerusCoin daemon.
  verus - VerusCoin command line utility.
  fetch_params.sh - utility to download the zcash parameters needed to start the VerusCoin command line tools and scripts

diff --cc doc/man/verus-cli/windows/README.txt
index af0dbd76abc5a600337ae32e0383b0423abbc351,179db1fbef18fb6d4308c8ec4e380574259f4986..40c582a238b6589d99cb3aacfc5bf3068d183898
--- 1/doc/man/verus-cli/windows/README.txt
--- 2/doc/man/verus-cli/windows/README.txt
+++ b/doc/man/verus-cli/windows/README.txt
@@@ -1,4 -1,4 +1,5 @@@
 +VerusCoin Command Line Tools v0.5.7
+ VerusCoin Command Line Tools v0.6.0-PBaaS-Cross-chain-Technology-Preview
  Contents:
  verusd.exe - VerusCoin daemon
  verus.exe - VerusCoin command line utility

diff --cc src/clientversion.cpp
Simple merge

diff --cc src/clientversion.h
Simple merge