Merge branch 'develop' into obj_render
Merge remote branch 'origin/obj_render' into obj_render
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