liberar actividad y actividades
miselanios
Merge branch 'master' of https://github.com/jose1988/srcC

Conflicts:
	java/com/pangea/capadeservicios/servicios/GestionDeActividades.java