Merge origin/master

Conflicts:
	build/classes/bike_bll/Bicicleta.class
	build/classes/bike_bll/Ciclista.class
	build/classes/bike_bll/Grupo.class
	build/classes/bike_bll/Objectivos.class
	build/classes/bike_bll/Tipo_Top.class
	build/classes/bike_bll/Top.class
	build/classes/bike_bll/Treinador.class
	build/classes/bike_bll/Treino.class
	nbproject/private/private.xml
Merge origin/master

Conflicts:
	build/classes/bike_bll/Bicicleta.class
	build/classes/bike_bll/Ciclista.class
	build/classes/bike_bll/Grupo.class
	build/classes/bike_bll/Objectivos.class
	build/classes/bike_bll/Tipo_Top.class
	build/classes/bike_bll/Top.class
	build/classes/bike_bll/Treinador.class
	build/classes/bike_bll/Treino.class
	nbproject/private/private.xml