fixes #27
fixes #28 fixes #30
Merge branch 'master' of https://github.com/clover3/isb

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml