Mejora en acceder a actividad y prueba con BD poblada
Merge branch 'master' of https://github.com/elcanie/fitbox.git
	modified:   FitBox/src/fitbox/view/ScreensFramework.java
Merge branch 'master' of https://github.com/elcanie/fitbox

Conflicts:
	FitBox/nbproject/private/private.properties
	FitBox/src/fitbox/view/ScreensFramework.java

	modified:   FitBox/nbproject/UPDATED.TXT
	new file:   FitBox/nbproject/jfx-impl_backup_2.xml
	new file:   FitBox/nbproject/jfx-impl_backup_3.xml
	modified:   FitBox/nbproject/private/private.properties
	modified:   FitBox/nbproject/private/private.xml
	modified:   FitBox/nbproject/project.properties
	new file:   FitBox/src/fitbox/Cronometro.java
	modified:   FitBox/src/fitbox/MuestraUsoBaseDatos.java
	new file:   FitBox/src/fitbox/controller/ConsultarClasificacionController.java
	modified:   FitBox/src/fitbox/controller/ConsultarVistaSemanal.java
	new file:   FitBox/src/fitbox/controller/LoginController.java
	modified:   FitBox/src/fitbox/controller/RealizarActividadController.java
	modified:   FitBox/src/fitbox/controller/perfil1Controller.java
	modified:   FitBox/src/fitbox/controller/perfil2Controller.java
	modified:   FitBox/src/fitbox/controller/perfil3Controller.java
	new file:   FitBox/src/fitbox/controller/perfilController4.java
	new file:   FitBox/src/fitbox/controller/perfilController5.java
	modified:   FitBox/src/fitbox/model/Usuario.java
	deleted:    FitBox/src/fitbox/model/datosAct.java
	modified:   FitBox/src/fitbox/model/datosUsuario.java
	new file:   FitBox/src/fitbox/view/Clasificacion.fxml
	new file:   FitBox/src/fitbox/view/Login.css
	new file:   FitBox/src/fitbox/view/Login.fxml
	modified:   FitBox/src/fitbox/view/RealizarActividad.fxml
	modified:   FitBox/src/fitbox/view/ScreensFramework.java
	new file:   FitBox/src/fitbox/view/StyleClasificacion.css
	modified:   FitBox/src/fitbox/view/perfil1.fxml
	modified:   FitBox/src/fitbox/view/perfil2.fxml
	modified:   FitBox/src/fitbox/view/perfil3.fxml
	new file:   FitBox/src/fitbox/view/perfil4.fxml
	new file:   FitBox/src/fitbox/view/perfil5.fxml
	modified:   FitBox/src/fitbox/view/stylerealizaractivdad.css
	modified:   FitBox/src/imagenes/Button-Pause-icon.png