Merge branch 'obj_render' into json_xml
Merge branch 'json_xml' into action_events
removing parts that should be just in admin_cards now
Remove json_xml parts

Conflicts:

	spec/lib/wagn/renderer/xml_spec.rb
Some card_controller cleanup
Maybe ATP?
Merge develop into action_events
...
Merge branch 'develop' into action_events
Merge fixups
Merge remote-tracking branch 'origin/action_events' into action_events
Merge branch 'develop' into action_events
...
Merge branch 'simple_stuff' into action_events
Merge action_events into account_cards