Merge pull request #151 from pdendek/master

Author Name Disambiguation major changes
new extractors, disambiguator
Fixed issues reported by Sonar.
new weights for features in new_disambiguation
scripts for analysing data, UDFs
cluster properties for w3 new features
features description fixed
exceptions handling in pig extractor added
pig extractor bugfix
pig script for analysing paramterers fixed
Merge branch 'master' of git://github.com/pdendek/CoAnSys
Merge branch 'master' of git://github.com/CeON/CoAnSys

Conflicts:
	disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/ExhaustiveAND.java
	disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/extractor/EXTRACT_CONTRIBDATA_GIVENDATA.java
exception handling in exhaustive and aproximate ANDs
Fixed issue in timer reported by Sonar.
Merge pull request #19 from wosiu/master

exception handling in exhaustive and aproximate ANDs