pom
Merge branch 'master' of https://github.com/projectdanube/xdi2-pixel.git

Conflicts:
	pom.xml