Multimedia editor

Finally found time to perform the merge :-)
I haven't looked at the changes that merged automatically, so the usual review would be appropriate.
Some changes are due to classes having been reformatted using Eclipse.