borre el ok que estaba mal
Merge branch 'master' of https://github.com/JadiraB/pucesd.git

Conflicts:
	inves/src/main/resources/com/pucesd/inves/package_es.properties