Updated RockControlGallery so that one of the HtmlEditors supports MergeFields
+ Got the MergeFieldPicker plug-in working in the HtmlEditor (CKEditor)