bugfix attempt
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/be/howest/groep5/breakout/controller/multimedia/SoundController.java
	src/be/howest/groep5/breakout/model/multimedia/Multimedia.java
Panel touch up