e
Merge branch 'stable-1.0'

Conflicts:
	TextToSpeech/AndroidManifest.xml