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