for ci test
Merge branch 'master' of
https://github.com/MadeInChina/ripple-lib-java.git

Conflicts:
	ripple-examples/ripple-android/src/main/java/com/ripple/android/activities/PayOneDrop.java