More deps
Merge branch 'working'

Conflicts:
	services/poller/pom.xml