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

Conflicts:
	Mp3_Player/MainWindow.xaml
	Mp3_Player/MainWindow.xaml.cs