Merge branch 'master' into matt-develop
Adds warning in dev-inspector when working copy is master branch
Fixes #60725380 - punctuation causes annual income amount to be truncated
Moves participant duplicate warning to sidebar so users can see it better
Adds multiple attendance options for visits
Fixes anonymous user login by adding customer_id
Filter count at top of page now shows correct record count
Fixes bulk email link to respond to applied filters
Shows dynamic count of selected rows
Adds profile pictures for participants
Finishes scholarship merging function
Fixes flash message render error
Adds participant attendance and notes to weekly activity log
Merge pull request #14 from uwdreamproject/matt-develop

Multi-option attendance, dynamic rows and filters, scholarship merging, and activity log improvements