Merge remote-tracking branch 'Rock-Upstream/develop' into develop
Merge remote-tracking branch 'Rock-Upstream/develop' into develop
Merge remote-tracking branch 'Rock-Upstream/develop' into develop
Merge remote-tracking branch 'Rock-Upstream/develop' into develop
Merge remote-tracking branch 'Rock-Upstream/develop' into develop
Merge remote-tracking branch 'Rock-Upstream/develop' into develop
Merge remote-tracking branch 'Rock-Upstream/develop' into develop
Merge remote-tracking branch 'Rock-Upstream/develop' into develop
Overrides the Get method on the People controller and on the GroupMembers controller to add option to include records of deceased people in the results. Fixes #583 and #584
- added codegen to generate Rock\SystemGuid\EntityType.cs (if we wanted to do that for all entity types)
- fixed up BinaryFileService to get EntityType from EntityTypeCache instead of DB
Merge pull request #586 from chrisfunk/feature-csf-IncludeDeceasedUpdate

Feature csf include deceased update
Merge remote-tracking branch 'origin/release-1.1.1' into develop
Merge remote-tracking branch 'origin/release-1.1.1' into develop
Merge remote-tracking branch 'origin/release-1.1.1' into develop
Merge remote-tracking branch 'origin/release-1.1.1' into develop
- 1.1 installer data files
- improved error reporting in Installer for invalid sql in the sql configuration step
- updated sql configuration script fixes:
     - Fixed issue from change that removed order from Attribute Value
     - Fixed issue from SafeSender having moved from Attribute Value to Defined Value
- Update version to 1.1.2