merge w master
Merge branch 'gh-pages' of github.com:makevoid/easywallet into gh-pages