version => 2.0.5.3
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml