added support for the wallet backups
fix conflicts
Merge pull request #85 from colkito/feature/wallet-backup-support

Feature/wallet backup support