merge
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 latest fixes (ATP) from action_events