Agregado empleado
Merge branch 'master' of https://github.com/manuel070289/IGF1152014.git

Conflicts:
	PRY/WebContent/WEB-INF/classes/hibernate.cfg.xml