Made Media:: public for easier json export
Merge branch 'master' of https://github.com/felixgirault/essence