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