Changed TinyMCE translations
Updated media and file_entity modules to alpha-1
Resolved merge conflict