fixed conflicts when pulling master
rebase conflict
added div wrapper to cc form
removed a stray link_to
fixed an indentation issue on payments/new
schema
changes to event show template to deal with changing field names and defaults