Merge remote branch 'origin/qa' into release
Adding site calendar to helpline role
Fixing date-span bug in feeds
Fixing bugs in participant status report
Further fixes to participant status report
Fixing bugs in tokens record (caused by new opal manager)
Merge remote branch 'origin/release' into qa