add names to users, add display user name to campaign index and show.
Merge in changes from small changes