Merge branch 'master' into acking

Conflicts:
	libISOBlue/AndroidManifest.xml