Merge branch 'master' of ssh://github.com/novacoin-project/novacoin