After many modifications.
Merge branch 'after'

Conflicts:
	.gitignore
	pom.xml
	src/main/resources/log4j.properties