cambios menores
cambios menores
Merge branch 'master' of https://github.com/elcanie/fitbox

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

	modified:   FitBoxMaster/src/fitbox/ObjetoWebCam.java
	modified:   FitBoxMaster/src/fitbox/controller/ConsultarClasificacionController.java
	modified:   FitBoxMaster/src/fitbox/controller/ConsultarVistaDiariaController.java
	modified:   FitBoxMaster/src/fitbox/controller/DescripcionActividadController.java
	modified:   FitBoxMaster/src/fitbox/controller/LoginController.java
	modified:   FitBoxMaster/src/fitbox/controller/PantallaPrincipalController.java
	modified:   FitBoxMaster/src/fitbox/controller/ScreensController.java
	modified:   FitBoxMaster/src/fitbox/controller/dao/Dal.java
	modified:   FitBoxMaster/src/fitbox/controller/dao/Dao.java
	modified:   FitBoxMaster/src/fitbox/model/BaseDeDatos.java
	modified:   FitBoxMaster/src/fitbox/view/ScreensFramework.java
	modified:   FitBoxMaster/src/fitbox/view/videos.fxml