add atom support to the ReST interfaces
refactor criteria to use Collections rather than Lists when possible
major refactoring and cleanup; more objects, pass alarm data
bad dep from a merge