Arreglados fallos
Merge branch 'master' of https://github.com/jam0101/dms1415

Conflicts:
	src/ubu/lsi/dms/agenda/gui/JFrameFormulario.java