Add masterclasses wysiwyg and remove debug from preprocess.
Merge conflict on template.php. Wheeee.