pigunit for new_disambiguation start

	modified:   disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/disambiguationTests.java
	modified:   disambiguation-author/src/main/pig/new_disambiguation.pig
Merge branch 'master' of git://github.com/pdendek/CoAnSys
Merge branch 'master' of git://github.com/pdendek/CoAnSys
commented

	modified:   ../java/pl/edu/icm/coansys/disambiguation/author/pig/disambiguationTests.java
EX_YEAR
EX_KEYWORDS

	modified:   disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/extractor/EXTRACT_CONTRIBDATA_GIVENDATA.java
	new file:   disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/extractor/EX_KEYWORDS.java
debug removed

	modified:   ../java/pl/edu/icm/coansys/disambiguation/author/pig/extractor/EX_KEYWORDS.java
Merge branch 'master' of git://github.com/pdendek/CoAnSys

Conflicts:
	disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/disambiguationTests.java
	disambiguation-author/src/main/pig/new_disambiguation.pig
EXTRACT_GIVENDATA new contructor start

	modified:   disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/extractor/EXTRACT_CONTRIBDATA_GIVENDATA.java
EXTRACT_CONTRIBDATA_GIVENDATA constructor for featureInfo added

	modified:   disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/SingleAND.java
	modified:   disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/extractor/EXTRACT_CONTRIBDATA_GIVENDATA.java
new_disambiguation with EXTRACT_CONTRIBDATA_GIVENDATA for futuresinfo - not tested

	modified:   disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/extractor/EXTRACT_CONTRIBDATA_GIVENDATA.java
	modified:   disambiguation-author/src/main/pig/new_disambiguation.pig
EXTRACT_CONTRIBDATA_GIVENDATA bugfix

	modified:   disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/extractor/EXTRACT_CONTRIBDATA_GIVENDATA.java
bugfix

	modified:   disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/extractor/EXTRACT_CONTRIBDATA_GIVENDATA.java
	modified:   disambiguation-author/src/main/pig/new_disambiguation.pig
extensions for pig ExhaustiveAND
exhoustive pig test
tools moved

	renamed:    disambiguation/src/main/java/pl/edu/icm/coansys/disambiguation/auxil/pig/PigDisambiguator.java -> disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/auxil/PigDisambiguator.java
	renamed:    disambiguation/src/main/java/pl/edu/icm/coansys/disambiguation/auxil/pig/ToList.java -> disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/auxil/ToList.java
	modified:   disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/ExhaustiveAND.java
exhaustive test bugfix

	modified:   new_disambiguation_ex_test.pig
	modified:   ../resources/test/dane0.in
corrections in exhaustiveAND; test file; fake features (Title,Year)
merge