Prepped for 2.3 release using deploy script. Lite ready for Google+Samsung.

Conflicts:
	AndroidManifest.xml