Merge branch 'master' of https://github.com/matfed/CoAnSys
Merge branch 'master' of https://github.com/matfed/CoAnSys
Merge branch 'master' of https://github.com/matfed/CoAnSys
Merge branch 'master' of https://github.com/matfed/CoAnSys
	deleted:    disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/Auxil.java
	deleted:    disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/AuxilI.java
	modified:   disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/SingleAND.java
	new file:   disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/disambiguationTests.java
	new file:   disambiguation-author/src/main/pig/test/test0_metadata.in
	new file:   disambiguation-author/src/main/pig/test/test1_metadata.in
Merge pull request #5 from wosiu/master

disambiguationTest - problem with metadata parse
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
resolving conflict
Merge branch 'master' of git://github.com/pdendek/CoAnSys
commented

	modified:   ../java/pl/edu/icm/coansys/disambiguation/author/pig/disambiguationTests.java
EX_YEAR
correct generation of UUID
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
commenting faulty tests
basic contribId-authId pairs creation
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
Merge branch 'master' of https://github.com/matfed/CoAnSys