angel 2003
angel 2010
Merge remote-tracking branch 'remotes/upstream/joan_master_1841' into angel_master_1747

Conflicts:
	java/AndroidManifest.xml
angel 2024
joan 2042