Merge remote-tracking branch 'origin/develop' into feature-na-prayer
Mostly working Prayer Admin Control Panel that demonstrates the issues I'm having with postbacks with these new custom checkbox fields.
Added block field attributes
Merge remote-tracking branch 'origin/develop' into feature-na-prayer

Conflicts:
	Rock/Rock.csproj
Merge remote-tracking branch 'origin/develop' into feature-na-prayer
Second draft of prayer request blocks.  Separated into multiple blocks.
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature-na-prayer

Conflicts:
	Rock/Rock.csproj
	RockWeb/Blocks/Administration/BlockTypes.ascx.cs
Working PrayerComment editing
adding filters, changing layout/format, created non-SQL2012 version of Mike's Populate_Groups script and a variant of his Populate_Plethora_of_Person sql except which uses real random names.
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature-na-prayer

Conflicts:
	Rock/Model/CategoryService.Partial.cs
	Rock/Rock.csproj
Removed duplicate inclusion of Model\CategoryService.Partial.cs from the Rock.csproj and added a 2008 compatible version of Mike's CodeGen_AddPage.sql
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature-na-prayer
final working draft of PrayerRequest administration blocks on pages with a migration.
Merge remote-tracking branch 'refs/remotes/origin/feature-na-prayer' into develop
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop