Changes filter criteria
Fixes some problems related to delete departments with members
Merge pull request #133 from insignia4u/issue-132

Changes filter criteria
Merge branch 'master' into issue-124
Enahancement #124

Conflicts:
	source/javascripts/organizationChart.js.coffee