cambios, cambios y mas cambios
Merge branch 'master' of https://github.com/jml88/tsi206

Conflicts:
	jatrick/logica_simulacion/ejbModule/META-INF/persistence.xml
* cosas y mas cosas