whr01
whr02
Merge branch 'master' of https://github.com/wilfredosystem/sistemaSBLM.git
5toxp
chavoq1
Merge branch 'rama01'

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