kiko01
Merge branch 'master' of
https://github.com/wilfredosystem/sistemaSBLM.git

Conflicts:
	src/com/sblm/bean/Prueba.java
valor01
Merge branch 'master' of
https://github.com/wilfredosystem/sistemaSBLM.git

Conflicts:
	src/com/sblm/bean/Prueba.java
aaaaaaa