Merge branch 'master' into update-fee
Merge branch 'update-fee' of github.com:domob1812/huntercoin into update-fee