merge
Merge branch 'master' of https://github.com/jml88/tsi206
commit
Merge branch 'master' of https://github.com/jml88/tsi206
commit
Merge branch 'master' of https://github.com/jml88/tsi206

Conflicts:
	jatrick/logica_simulacion/ejbModule/timers/TimerSimularPartido.java