Merge branch 'master' of git://github.com/CeON/CoAnSys
Merge branch 'master' of ssh://github.com/pdendek/CoAnSys
Merge branch 'master' of ssh://github.com/pdendek/CoAnSys
major bugfixes is CompleteLinkageStrategy
Merge branch 'master' of git://github.com/pdendek/CoAnSys

Conflicts:
	disambiguation/src/main/java/pl/edu/icm/coansys/disambiguation/clustering/strategies/CompleteLinkageHACStrategy.java