Updated file entity to latest dev
Updated media to latest dev