Fading on Timeline

Added the Fade Up and Fade Down features to the timeline. Does not alter
the ctl file yet.
Merge remote-tracking branch 'origin/Development' into Development

Conflicts:
	Choreography_Dev/src/choreography/view/timeline/TimelineController.java