more changes

more changes
Merge branch 'master' of https://github.com/Katastrophos/neoscoin-wallet