Merge branch 'master' of git@github.com:cxjava/maty-project.git

Conflicts:
	j2ee-parent/pom.xml