Merge pull request #1000 from kbromer/feature/905-notification-emails

Added an isActive flag to the sys admin query.
Revert "Added an isActive flag to the sys admin query."
Merge pull request #1001 from SalesforceFoundation/revert-1000-feature/905-notification-emails

Revert "Added an isActive flag to the sys admin query."
Merge branch 'dev' of https://github.com/SalesforceFoundation/Cumulus into dev

Conflicts:
	src/classes/ERR_Handler_TEST.cls
	src/classes/ERR_Notifier.cls