Rebase shm-dev onto current dev branch and resolve conflicts

[thantsintoe]

I have pulled changes from the Shardeum's lib-net and created a new branch called "shm-dev". Now we want to merge it into our dev branch but there are some conflicts. Review, resolve and test it after the rebase.