Editar Task
Merge branch 'master' of https://github.com/bheftye/MemoAgenda2

Conflicts:
	ProyectoAgenda/src/fmat/proyectoMemo/struts/model/Usuario.java
Merge branch 'master' of https://github.com/bheftye/MemoAgenda2