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

Conflicts:
	findme/src/com/findme/app/views/CustomNotificationsReceivedAdapter.java