Merge branch 'master' of github.com:/fzcoin/frozencoin