Cambios en interfaz varios
Merge branch 'master' of https://github.com/mateohi/obligatorio-dsdm

Conflicts:
	findme/res/layout/fragment_my_pet.xml