a
Merge branch 'master' of https://github.com/comaple/KDD

Conflicts:
	scrawler/src/main/assembly/assembly.xml
s
Merge branch 'master' of https://github.com/comaple/KDD