1.10.3.2
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
	ChangeLog