Updating SCM

Conflicts:
	pom.xml