Codec Properties mal angefangen
Merge remote-tracking branch 'origin/master'

Conflicts:
	Video Analyser 2/src/model/Clip.java