+ Add CreatedByPersonName, ModifiedByPersonName, CreatedByPersonId, and ModifiedByPersonId as available lava merge fields for all models
- Update HtmlContentDetail block to display debug info even if content doesn't contain merge fields, and clean up global attribute merge filed processing a tiny bit.
- Rename LiquidInclude and LiquidIgnore attributes to LavaInclude, LavaIgnore
- Rename files
- Revert last change
- fix issue with location picker not displaying any UI for selecting address.
- Move migrations to subfolder
- Add Readme to repo
- Updated readme
- Revert the disabling of combining toolkit scripts as it did not eliminate the exceptions
+ Updated the Memo field type so that attributes of this type retain their line breaks when displayed on page (i.e. workflow entry screen, workflow detail, etc.)
- fixed issue where CheckIn Configuration wouldn't remember child sub groups of a new parent group (fixes #729)
Merge branch 'develop' into feature-mp-bootstrap-modal

Conflicts:
	Rock/Web/UI/RockPage.cs