joan commit 22:04
Merge remote-tracking branch 'remotes/upstream/joan_master_1722' into angel_master_1632

Conflicts:
	java/gen/com/upv/adm/adm_personal_shapes/R.java
angel 2212