media module, 7.x-2.0-unstable7

The media module, 7.x-2.0-unstable7, broke the ck. first changes, more needed.