Merge pull request #1 from arryanggaputra/1.1

Media Manager
Merge remote-tracking branch 'origin/master' into 1.1