remove step 5 specific changes
merge changes
Merge branch 'step4' into step5

Conflicts:
	pom.xml
Merge branch 'step5'