Merge branch 'develop' into obj_render
Merge remote branch 'origin/obj_render' into obj_render
Remove cardtype.rb, was only needed for old migrations
Merge branch 'obj_render' into json_xml
Merge branch 'json_xml' into admin_cards
Fixing signup view
Remove json_xml parts
Sort of working signin view and action