Emma: collector implementation with websockets
Merge branch 'master' of https://github.com/nordinh/ipsum.git

Conflicts:
	Debug localhost.launch
	pom.xml