modified:   FitBox/nbproject/private/private.properties
Merge branch 'master' of https://github.com/elcanie/fitbox

Conflicts:
	FitBox/nbproject/private/private.properties
VistasCalendario modificadas y añadido el link a pantalla principal