Modificaciones angel
Merge branch 'master' of https://github.com/XuUmSdBvOUZd4KtSNwzb/Ejb

Conflicts:
	CitaImpl.java
	IngresoImpl.java