cambios para merge
Merge branch 'inserts' of https://github.com/linuxknow/gestionempleado into inserts

Conflicts:
	controller/rrhh.php