Added MergeFieldPicker back to RockControlGallery now that it is functional again