Some bug fixes in the messaging, contact peer message test extended.
Merge branch 'master' of https://github.com/ippes/Hive2Hive.git