Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/CeON/CoAnSys
Merge remote-tracking branch 'acz-icm/master'
Merge pull request #115 from lukdumi/master

disambiguation-work / working beta version
Merge remote-tracking branch 'upstream/master'
Changed address of test cluster
Merge pull request #116 from acz-icm/master

Changed address of test cluster
getting rid of warnings
Merge branch 'master' of https://github.com/CeON/CoAnSys
Merge pull request #117 from matfed/master

Getting rid of non-exhaustive match warnings
Test hadoop server back to old name
Merge pull request #118 from acz-icm/master

Back to old name of test cluster
Changed dependencies of cermine-impl (1.1) and bwmeta (2.2.0)
Merge pull request #119 from acz-icm/master

Changed versions of cermine and bwmeta in dependencies
Changed version of cermine-impl in dependencies of citations
Merge pull request #120 from acz-icm/master

Dependency of cermine-impl in citations module
Updated oozie dependencies after oozie release
tests run as junit + StringUtils.getTrailingInteger as String
Merge remote-tracking branch 'upstream/master'