[*] Manual merge

CMakeLists.txt

@@ -46,7 +46,7 @@ SET( CPACK_GENERATOR "DEB")
 SET( CPACK_PACKAGE_NAME  "${PROJECT_NAME}")
 SET( CPACK_PACKAGE_VERSION_MAJOR 2)
 SET( CPACK_PACKAGE_VERSION_MINOR 6)
-SET( CPACK_PACKAGE_VERSION_PATCH 0)
+SET( CPACK_PACKAGE_VERSION_PATCH 1)
 
 SET( CPACK_SYSTEM_NAME "debian-9.9-amd64")
 SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")

dist/etc/network/kelvin-testnet/chain-0.cfg

@@ -2,6 +2,7 @@
 id=0x0000000000000000
 shard_id=0x0000000000000000
 name=zerochain
+load_priority=1
 # Possible values [token, emission, transaction] 
 datum_types=[token,emission,shard,ca]
 consensus=dag_poa

dist/etc/network/kelvin-testnet/chain-plasma.cfg

 [chain]
 id=0x0000000000000001
 name=plasma
+load_priority=2
 # Possible values [token, emission, transaction] 
 datum_types=[transaction,ca]
 consensus=dag_pos