Revert "2014/12/31 MusicPlayer"

This reverts commit dae00f9ad4f87df96f4b927921d75831469a7b03.