+ write baptism record changes to the baptisee's person history.
+ Corrected error that occurred with Baptizees when two Person objects are merged.
+ Rock Update
-These should not be in the repo.
Merge remote-tracking branch 'origin/develop' into feature-dm-PrayerBook-GroupsOnly

Conflicts:
	RockWeb/Blocks/Groups/GroupMemberDetail.ascx.cs
	com.centralaz.Accountability/bin/Debug/Rock.dll