Application_End now writes an entry EventLog explaining why the application was shutdown.  Look in the EventLog "Rock" to see if the Application is shutting down more than expected.
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
Added new Badge and BadgeField server controls.  Added a badge field column to the BlockType block as an example.
Add Item Count to the bottom of the grid
Fix some issues with the ItemCount and RowItemText functionality
Add CategoryDetail block
Updated CodeGen_PagesBlocksAttributesMigration so you don't have to use TextOutput and you aren't limited to 8000 chars
Enhanced the managed MEF components to support security, update Report Filter components to be 'managed' MEF components, and fixed the modal popup on the security grid field control and the entity type block
Added a INotRowSelectedField interface that custom BoundField controls can implement to prevent fields (columns) of that type from firing the RowSelected event on the grid
Added a way for a child class to override the default value of it's parent class default attribute value.  Needed this for managed MEF component types.  i.e. Some types are active by default (report filters), and some types are not (geocoding).
Added block field attributes
Merge remote-tracking branch 'origin/develop' into feature-na-prayer

Conflicts:
	Rock/Rock.csproj
Fix rendering of Toggle control to support autopostback
Merge remote-tracking branch 'origin/develop' into feature-na-prayer
Second draft of prayer request blocks.  Separated into multiple blocks.