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
Merge branch 'master' into DE2979
Merge branch 'master' into DE2979
Merge branch 'master' into DE2979
updated AT to reference correct id for category node in tree html
Merge branch 'DE2979'