asdf
Merge branch 'master' of https://github.com/medien-dresden/mbo-2014

Conflicts:
	Mp3_Player/Images/cancel.jpg
	Mp3_Player/Images/check.jpg
	Mp3_Player/Images/next.jpg
	Mp3_Player/Images/previous.jpg
	Mp3_Player/Images/stop.jpg
	Mp3_Player/MainWindow.xaml
refactorz