Added descriptions to keywords extraction's options
Merge branch 'master' of git://github.com/CeON/CoAnSys
Changed keywords extraction workflow's name
dfs.client.socket-timeout option added to workflow definition
Merge pull request #141 from krzywojc/master

dfs.client.socket-timeout option added to workflow definition
Merge branch 'master' of git://github.com/CeON/CoAnSys

Conflicts:
	keywords-extraction/keywords-extraction-workflow/src/main/oozie/config-default.xml
Merge pull request #142 from acz-icm/master

Description to keywords extraction options. Workflow's name.
Clean up oozie config file
Merge pull request #143 from acz-icm/master

Clean up oozie config file
- Fixed issues reported by Sonar.
- Fixed issues reported by Sonar.
- Fixed issues reported by Sonar.
- Removed unused class.
Changed output of keywords extraction module
Leave empty username in config files
Merge pull request #144 from acz-icm/master

Use "standard" keywords list in output of keywords extraction module
Extraction of NLM from PDF files, using CERMINE
Correcting parameter name
Merge pull request #145 from acz-icm/master

NLM extraction from PDFs using CERMINE
Timer (benchmark)
Normalize surnames in extract given data
comments translated
Merge branch 'master' of git://github.com/CeON/CoAnSys

Conflicts:
	disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/AproximateAND.java
	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/GenUUID.java
	disambiguation-author/src/main/java/pl/edu/icm/coansys/disambiguation/author/pig/extractor/EXTRACT_CONTRIBDATA_GIVENDATA.java