prep test build
Conflicts:

	AndBible/AndroidManifest.xml