Upgraded SI

Conflicts:
	parent/pom.xml