Integrado el seguimiento de videos y el paso de usuario por las diferentes ventanas.
Merge branch 'master' of https://github.com/elcanie/fitbox

Conflicts:
	FitBox/src/fitbox/controller/dao/Dal.java

	new file:   FitBox/lib/joda-time-2.3.jar
	modified:   FitBox/nbproject/UPDATED.TXT
modified:   FitBox/nbproject/private/private.properties
	modified:   FitBox/nbproject/project.properties
	modified:   FitBox/src/com/sai/javafx/calendar/FXCalendar.java
	renamed:    FitBox/src/fitbox/LanzadorConsultarCalendario.java -> FitBox/src/fitbox/LanzadorConsultarVistaDiaria.java
	modified:   FitBox/src/fitbox/LanzadorConsultarVistaMensual.java
	modified:   FitBox/src/fitbox/LanzadorConsultarVistaSemanal.java
	modified:   FitBox/src/fitbox/MuestraUsoBaseDatos.java
	deleted:    FitBox/src/fitbox/controller/ConsultarCalendarioController.java
new file:   FitBox/src/fitbox/controller/ConsultarVistaDiariaController.java
	deleted:    FitBox/src/fitbox/controller/ConsultarVistaMensual.java
	new file:   FitBox/src/fitbox/controller/ConsultarVistaMensualController.java
	modified:   FitBox/src/fitbox/controller/ConsultarVistaSemanal.java
	new file:   FitBox/src/fitbox/controller/ConsultarVistaSemanalController.java
	modified:   FitBox/src/fitbox/controller/dao/Dal.java
	modified:   FitBox/src/fitbox/controller/dao/Dao.java
	new file:   FitBox/src/fitbox/model/Calendario.java
	deleted:    FitBox/src/fitbox/view/ConsultarCalendario.fxml
	new file:   FitBox/src/fitbox/view/ConsultarVistaDiaria.fxml
	modified:   FitBox/src/fitbox/view/ConsultarVistaMensual.fxml
	modified:   FitBox/src/fitbox/view/ConsultarVistaSemanal.fxml
	modified:   JavaFXApplication12/nbproject/project.properties