Pulling some simple (mostly renaming) changes up
a little more user_card => auth_card
Merge branch 'develop' into simple_stuff
Merge branch 'simple_stuff' into action_events