muchos cambios
angel 1833
Merge remote-tracking branch 'remotes/upstream/angel_master_1747' into joan_master_1841

Conflicts:
	java/AndroidManifest.xml
	java/gen/com/upv/adm/adm_personal_shapes/R.java
	java/res/layout/screen05.xml
	java/src/com/upv/adm/adm_personal_shapes/screens/screen02.java
	java/src/com/upv/adm/adm_personal_shapes/screens/screen03.java
	java/src/com/upv/adm/adm_personal_shapes/screens/screen04.java
	java/src/com/upv/adm/adm_personal_shapes/screens/screen05.java
	java/src/com/upv/adm/adm_personal_shapes/screens/screen12.java
	java/src/com/upv/adm/adm_personal_shapes/screens/screen15.java
	java/src/com/upv/adm/adm_personal_shapes/screens/screen21.java
	java/src/com/upv/adm/adm_personal_shapes/screens/screen23.java