1356
angel 1621
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