fine edition
rm maven
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/crawler4j.properties