1.9.4
Match background option
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml