Build-2
Merge remote-tracking branch 'aokp/ics' into jb

Conflicts:
	AndroidManifest.xml