joan 2254
joan 2255
Merge remote-tracking branch 'remotes/upstream/angel_master_1632' into joan_master_2213
Merge remote-tracking branch 'remotes/upstream/angel_master_1632' into joan_master_2213
Merge remote-tracking branch 'remotes/upstream/angel_master_1632' into joan_master_2213
joan commit 0025
joan commit 1411
joan coomit 1619
joan commit 1623
Merge remote-tracking branch 'remotes/upstream/angel_master_1632' into joan_master_2213

Conflicts:
	java/gen/com/upv/adm/adm_personal_shapes/R.java
joan commit 1915
joan commit 1240
joan commit 1303
Merge remote-tracking branch 'remotes/upstream/joan_master_2213' into angel_master_1632

Conflicts:
	java/AndroidManifest.xml
	java/gen/com/upv/adm/adm_personal_shapes/R.java
angel 1427