Merge replace-media branch

Yep, the replace media branch
issue https://github.com/AUTUpStageTeam/UpStage2013/issues/47