fixed incorrect base commit
Merge branch 'master' of https://github.com/tikalk/.NetDec13FuseDay_MediaCenter