fixed bug with timer
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	lab2/src/main/java/at/ac/tuwien/digitalpreservation/application/Player.java
merge fix