joan commit 1:07
Merge remote-tracking branch 'remotes/upstream/joan_screens18&13' into angel_con_testeador_web

Conflicts:
	java/gen/com/upv/adm/adm_personal_places/R.java
	java/src/com/upv/adm/adm_personal_places/classes/DatabaseProxy.java
login y registration