1.9.5.4
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
	ChangeLog