Merge origin/master

Conflicts:
	FitBox/src/fitbox/view/ScreensFramework.java
Merge origin/master

Conflicts:
	FitBox/src/fitbox/view/ScreensFramework.java
Merge origin/master

Conflicts:
	FitBox/src/fitbox/view/ScreensFramework.java
Merge origin/master
Merge origin/master

Conflicts:
	FitBox/src/fitbox/view/ScreensFramework.java
	modified:   JavaFXApplication12/nbproject/project.properties
Merge branch 'master' of https://github.com/elcanie/fitbox

Conflicts:
	FitBox/nbproject/UPDATED.TXT
	FitBox/nbproject/private/private.properties
	FitBox/src/fitbox/controller/ConsultarVistaDiariaController.java
	FitBox/src/fitbox/controller/ConsultarVistaMensualController.java
	FitBox/src/fitbox/controller/ConsultarVistaSemanal.java
	FitBox/src/fitbox/controller/ConsultarVistaSemanalController.java
	FitBox/src/fitbox/controller/PantallaPrincipalController.java
	FitBox/src/fitbox/view/ConsultarVistaDiaria.fxml
	FitBox/src/fitbox/view/ConsultarVistaMensual.fxml
	FitBox/src/fitbox/view/ConsultarVistaSemanal.fxml
	FitBox/src/fitbox/view/ScreensFramework.java

	modified:   FitBox/nbproject/UPDATED.TXT
	modified:   FitBox/nbproject/private/private.properties
	modified:   FitBox/nbproject/project.properties
	modified:   FitBox/src/fitbox/controller/ConsultarVistaDiariaController.java
	modified:   FitBox/src/fitbox/controller/ConsultarVistaMensualController.java
	modified:   FitBox/src/fitbox/controller/ConsultarVistaSemanalController.java
	modified:   FitBox/src/fitbox/controller/LoginController.java
	modified:   FitBox/src/fitbox/controller/PantallaPrincipalController.java
	modified:   FitBox/src/fitbox/controller/perfil1Controller.java
	modified:   FitBox/src/fitbox/controller/perfil2Controller.java
	modified:   FitBox/src/fitbox/controller/perfilController4.java
	modified:   FitBox/src/fitbox/controller/perfilController5.java
	new file:   FitBox/src/fitbox/view/Calendario.css
	modified:   FitBox/src/fitbox/view/ConsultarVistaDiaria.fxml
	modified:   FitBox/src/fitbox/view/ConsultarVistaMensual.fxml
	modified:   FitBox/src/fitbox/view/ConsultarVistaSemanal.fxml
	modified:   FitBox/src/fitbox/view/Login.fxml
	modified:   FitBox/src/fitbox/view/ScreensFramework.java
	modified:   FitBox/src/fitbox/view/perfil1.fxml