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

Conflicts:
	jatrick/logica_simulacion/ejbModule/timers/TimerMain.java
	jatrick/web_jatrik/.settings/org.eclipse.jdt.core.prefs
merged
Merge branch 'master' of https://github.com/jml88/tsi206
servicios