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