changes in getdiff
Merge branch 'develop' of github.com:yukuku/androidbible-sync into develop
Merge branch 'develop' of github.com:yukuku/androidbible-sync into develop

Conflicts:
	AlkitabSyncClient/src/yuku/alkitabsync/client/ClientImpl.java
Merge branch 'develop' of github.com:yukuku/androidbible-sync into develop

Conflicts:
	AlkitabSyncClient/src/yuku/alkitabsync/client/ClientImpl.java
Add neutral button to randomly edit bookmark