Commit 7:20
Merge branch 'master' of https://github.com/bheftye/MemoAgenda

Conflicts:
	ProyectoAgenda/.classpath

	ProyectoAgenda/build/classes/fmat/proyectoMemo/struts/action/GrupoAction.class