Merge branch 'master' of
https://github.com/ubicity-principal/ubicity-root.git

Conflicts:
	pom.xml
Merge branch 'master' of
https://github.com/ubicity-principal/ubicity-root.git