Arreglando Calendario
Merge branch 'master' of https://github.com/elcanie/fitbox.git
Base de datos local, Realizar Desafios
Merge branch 'master' of https://github.com/elcanie/fitbox

Conflicts:
	FitBoxMaster/src/fitbox/controller/PantallaPrincipalController.java

	new file:   nbproject/UPDATED.TXT
	modified:   src/fitbox/controller/PantallaPrincipalController.java
	modified:   src/fitbox/controller/RealizarActividadController.java
	new file:   src/fitbox/controller/RealizarEventosController.java
	modified:   src/fitbox/controller/dao/Dal.java
	modified:   src/fitbox/model/Video.java
	modified:   src/fitbox/view/RealizarEvento.fxml
	deleted:    src/fitbox/view/RealizarEventoController.java
	modified:   src/fitbox/view/ScreensFramework.java
	modified:   ../Web/estilo/style.css
new file:   ../Web/foro.html
	modified:   ../Web/index.html
	new file:   ../Web/subforo.html