cambios
Merge branch 'master' of https://github.com/mateohi/obligatorio-dsdm

Conflicts:
	FindMeServer/src/main/resources/hibernate.cfg.xml
	Findme/bin/Findme.apk
	Findme/bin/classes.dex
	Findme/bin/resources.ap_
	Findme/gen/com/example/findme/R.java