Abdera collector
Merge branch 'master' of https://github.com/nordinh/ipsum.git

Conflicts:
	collector/pom.xml
Emma: collector feed