sube relacion ManyToMany
merged
Merge branch 'master' of https://github.com/jml88/tsi206
merged
Merge branch 'master' of https://github.com/jml88/tsi206

Conflicts:
	jatrick/logica_jatrik/ejbModule/campeonato/Torneo.java
	jatrick/logica_jatrik/ejbModule/configuracionGral/ConfiguracionGral.java
Finanzas