SISDEF
UF
Merge branch 'master' of https://github.com/cursorcl/cpruebas

Conflicts:
	cprueba.sql
	cpruebas.detection/src/cl/eos/detection/ExampleBinaryOps.java