Merge remote-tracking branch 'origin/master'

Conflicts:
	Tritreck/Tritreck-ejb/src/main/java/com/tritreck/servicio/schedule/ServicioSchedule.java