Becky's changes to Join & Give based on her Development meeting notes.
Merge branch 'develop' into content