DE2979 category nodes evaluate their enabled and auth status based on aggregate of children nodes
DE2979 evaluating checkable and ischecked status separately for categories and edorgs
DE2979 initial ATs passed
DE2979 additional AT added to feature
Merge branch 'master' into DE2979
Merge branch 'master' into DE2979
Merge branch 'master' into DE2979
Merge branch 'master' into DE2979

Conflicts:
	sli/admin-tools/admin-rails/lib/edorg_tree_helper.rb
DE2979 - integrated changes from hinsdale to support category checkboxes responding correctly to deselection of child nodes. update ATs.
Merge branch 'master' into DE2979
Merge branch 'master' into DE2979
Merge branch 'master' into DE2979

Conflicts:
	sli/admin-tools/admin-rails/lib/edorg_tree_helper.rb
[US5975] initial ingestion schema changes
Merge branch 'us5318' into de3005 to absorb changes needed in the DAL for ingestion of section level attendance
Merge branch 'us5318' into de3005
Merge branch 'de3005' of https://github.com/inbloomdev/datastore into de3005
DE3005 When PATCHING attendance, empty attendanceEvent array
DE3005 When PATCHING attendance, empty attendanceEvent array
Merge branch 'master' into de3005
DE3005 When PATCHING attendance, empty attendanceEvent array(2)