Merge branch 'master' of github.com:rippleFoundation/ripple-client into develop
Merge branch 'develop' of github.com:rippleFoundation/ripple-client into develop