File Entity + Media updates
Merge pull request #670 from sylus/master

File Entity + Media Updates