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
- Move migrations into version folder
Merge remote-tracking branch 'Rock-Upstream/develop' into develop
- Change the Rock Update block to do a client-side redirect instead of a postback when restarting after update.
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
+ Update HTML Content Detail block to include merge fields even when there is not a logged in person.
+ Update Dynamic Data Block to support column sorting, and multiple result sets.
Merge remote-tracking branch 'origin/release-1.1.1' into develop
- Fix exception that occurs when channel is not set on ContentDynamicBlock.
Merge remote-tracking branch 'origin/release-1.1.1' into develop
+ Update Dynamic Data block to allow using parameters in text queries
Merge remote-tracking branch 'origin/release-1.1.1' into develop