Merge branch 'master' of github.com:0xDEADFACE/novacoin into DEADFACE