query for all services, even expired services
Merge branch 'master' into performance-tuning

Conflicts:
	emas/app/eventhandlers.py