joan 1018
angel 1035
jj
Merge remote-tracking branch 'remotes/upstream/joan_master_1844' into angel_master_1747
joan 1328
angel 1431
joan commit
Merge remote-tracking branch 'remotes/upstream/joan_master_1844' into angel_master_1747

Conflicts:
	java/res/layout/screen04.xml
	java/src/com/upv/adm/adm_personal_shapes/screens/screen04.java
angel 1435