Weekly update of contrib modules
Issue #592: Update media to version 7.x-2.0-beta1.
Issue #592: Downgrade media to version 7.x-2.x-alpha4 and file_entity to version 7.x-2.0-beta1.
Revert media to 2.0-alpha4