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