Initial thoughts on the fix.
XML documentation update on Rock.Data.Entity base class
XML documentation updates.
Merge branch 'feature-csf-ModelDocumentation'
David's help with the history issue
Final clean-up
Merge branch 'feature-je-history'
Merge branch 'origin/develop'

Conflicts:
	Rock/Web/UI/RockPage.cs
RockPage Changes
Final update
Checkin Config UI is almost fully functional.  Just have a couple of small things left 1) Drag/Drop ordering 2) Graceful validation for invalid values in inputs 3) Graceful validation when deleting something that can't be deleted (for example, a group that has GroupMembers)
Checkin Config UI - Drag/Drop Ordering now works for both Group and GroupType
fix missing reference in Rock.CodeGeneration
Updated Checkin Config UI with Validation for Deletes and invalid inputs
Migration for new Check-in Configuration Block
Merge branch 'origin/develop'

Conflicts:
	Rock/Rock.csproj