agragar Colajsp y js
Merge branch 'master' of https://github.com/raulrb/IMECColaboradores.git

Conflicts:
	WebContent/JS/validarFormColaborador.js
	src/CO/AgregarColaboradorCo.java