-Rock 1.0 upgrade Accountability fix
Merge remote-tracking branch 'origin/develop' into feature-dm-PrayerBook-GroupsOnly