- started on getting Reports and Dataviews to work with plugin entities
- Fix compiler warnings
- Move all the custom liquid filters from the DotLiquid project into the Rock.Lava.RockFilters class. With the exception of one small change in DotLiquid.Context to handle enums, the DotLiquid project no longer has custom changes (or needs reference to Humanizer and RockDateTime)
Merge branch 'develop' into feature-mp-dataview_context
+ New prayer requests that were not auto-approved will now show up in the Prayer Requests list without having to check 'Show Expired Requests' (Fixes #685).
- fix Report getting an error when sorting if no fields where selected
Merge branch 'develop' into feature-mp-dataview_context
- fix DataViews/Reports getting an exception if a non-core entity is selected (fixes #686)
- Move modal styling to variables

and cleanup whitespace
- fix SiteDetail throwing an exception when attempting to delete from the SiteDetail delete button. (Fixes #705)
- Fix CORS
+ Update the location and naming convention of the Lava (liquid) include files to  be RockWeb/Themes/[Theme]/Assets/Lava/[Template].lava instead of RockWeb/Themes/[Theme]/Assets/Liquid/_[Template].liquid.
Merge branch 'pre-alpha' into develop
- Refactor the only remaining custom code in dotliquid project. This change mirrors what was submitted as a pull-request to dotliquid repo (https://github.com/formosatek/dotliquid/pull/118).
+ Update the WorkflowAttribute and WorkflowTextOrAttribute attributes to be able to filter the list of available attributes by those that have specific field types allowed by the action that uses them.
- styling tweaks to DISC blocks
- Modal footer styling
- fix issue where the rename dialog would popup under the newfolder dialog when you press enter (on FF and Chrome). (fixes #710)
- update DynamicData block so that'll figure out its datakeys from either the UrlMask or simply "Id" (If the datatable has an Id column). This will fix a situation where a DynamicData block in Person mode would select everybody even if only a couple of records where selected.
- Update a few references of tip-liquid to tip-lava