UPDATE MIX
Merge branch 'master' of https://github.com/zian92/SoPra

Conflicts:
	SProject/src/de/glurak/frontend/mainFrame/playQueue/PlayQueueView.java
Merge branch 'master' of https://github.com/zian92/SoPra