put the  "or IsSystem=0" back into the Attribute Values part, but as "or (IsSystem=0 and a.EntityTypeQualifierColumn = 'BlockTypeId').  This should hopefully pick up new Block Attribute Values without picking up Attribute Values that aren't block attributes
update Dev Tool for TreeView to at least display stuff with correct parent-child relationship! oops
-- Updated CheckinScheduleBuilder to filter by ParentLocation (all Descendents) using new GetAllDescendents() LocationService method.  Cleaned up other minor bugs
Merge branch 'origin/develop'
Migration for Checkin Admin pages and Checkin Schedule Builder page/block