ver
Merge remote-tracking branch 'remotes/origin/develop'
ver
Merge remote-tracking branch 'remotes/origin/develop'
ver
Merge branch 'develop' of github.com:rippleFoundation/ripple-client
Merge branch 'master' of github.com:rippleFoundation/ripple-client
Merge remote-tracking branch 'remotes/origin/develop'
ver
Merge branch 'master' of github.com:rippleFoundation/ripple-client
ver .2.15
Merge remote-tracking branch 'remotes/origin/develop'

Conflicts:
	index.html
ver .2.16
.
Merge remote-tracking branch 'origin/develop'