Fix typo
Rearrange the dependencies order in pom.xml
Merge branch 'step-3' into step-4

Conflicts:
	pom.xml
Merge branch 'step-4' into step-5

Conflicts:
	pom.xml