changes
Merge branch 'develop' of github.com:zodman/darkwallet into develop