Merge branch 'develop'
Merge branch 'develop'
Removed the "Control Amount" column and renamed the "Variance" column to "Var from Control".
- the Rock Solid Church sample data script now uses a stored procedure to build fake attendance data
- More person merge updates.  Person merge now works with this update.
SystemConfiguration block can now udpate the RunJobsInIISContext app setting.
* Added badge types of Attending Duration and In Group Of Type [doc]
Fixed the grid to show the status in the correct column.
- Added new badge type configurations
- Fixed label on in group of type badge to give message when not in group
- Update EditPerson to create nickname and history correctly when adding a new person to family
Fixed #297
- Fix issue with family edit displaying save confirmation when clicking save
Fixes #295
+ [devdoc] Add new TemplateFieldUnselected that can be used on a grid in place of the normal TemplateField when the column should not fire the row selected event
Fixes #294
- Update family edit to only display a record status if all family members have thes same value, and only update family member's record status when a value is selected.
Fixes #277
- Update tag detail blocks (Peaple > Tags & General Settings > Tags) to show page title and breadcrumbs correctly.
Fixes #265
- Fixed issue with select dropdowns being hidden on mouseover in Firefox.
Fixes #283
- Remove timzone check when adding file change monitor (doesn't seem to be an issue anymore)
Fixes #161
Merge branch 'develop'
- Fix viewstate error in the attributes block
Fixes #290
- Fix the component field type's format value method to correctly display the selected value