Fix some tag/trunk merge issues
Removing json/xml stuff (to another branch)
Revert the xml/json removal commit on json_xml branch
revert unnecessary test change
Merge branch 'obj_render' into json_xml
Merge remote-tracking branch 'origin/obj_render' into json_xml
Cleaning up all_roles so it doesn't fetch for AnonID
merge forward (manually) the cleanup of the renderer calling code
Fixups/cleanups based on comments
remove json_renderer, hope this isn't needed for any special searches, not tests are failing
Merge of obj_render into action_events (need json_xml too now)
wip, action_events needs a bit of work