Remove params[:object] thing, not sure where it is from even
Merge remote-tracking branch 'origin/obj_render' into obj_render
Merge branch 'obj_render' into json_xml
Merge branch 'json_xml' into admin_cards
Merge remote-tracking branch 'origin/admin_cards' into admin_cards