SIT-382

Conflicts:
	pom.xml
SIT-382