move mediaclick logic into manager
Merge pull request #603 from arnaudbey/mediaclick

move mediaclick logic into manager