Merge origin/master

Conflicts:
	Choreography_Dev/src/choreography/view/ChoreographyController.java
Merge origin/master

Conflicts:
	Choreography_Dev/src/choreography/view/timeline/Timeline.java
	Choreography_Dev/src/choreography/view/timeline/TimelineController.java
Merge origin/master

Conflicts:
	Choreography_Dev/src/choreography/view/timeline/Timeline.java
	Choreography_Dev/src/choreography/view/timeline/TimelineController.java
Merge origin/master

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