VERSION => 2.1.13
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml