added encryption/decryption
Merge branch 'master' of https://github.com/jseims/trustedcoin-web-wallet