Sets f text when sweeps changes
Hopefully nothing breaks......
Merge origin/master

Conflicts:
	Choreography_Dev/src/choreography/view/ChoreographyController.java