abc
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/upv/adm/adm_project_joan/classes/CustomActionBarActivity.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen02.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen03.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen04$ButtonClickHandler.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen04$DialogButtonClickHandler.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen04$DialogSelectionClickHandler.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen04.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen05.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen07.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen12.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen13.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen15.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen17.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen18.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen19.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen20.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen21.class
	bin/classes/com/upv/adm/adm_project_joan/screens/screen23.class
	src/com/upv/adm/adm_project_joan/screens/screen02.java