Added media and file_entity modules
Added and applied patch to media module