Remove cardtype.rb, was only needed for old migrations
Merge branch 'obj_render' into json_xml
Merge remote branch 'origin/json_xml' into json_xml