develop client
ignore workspace.xml
Merge branch 'develop' of github.com:yukuku/androidbible-sync into develop

Conflicts:
	.idea/workspace.xml