adding missing persist()
Merge branch 'research' of https://github.com/matfed/CoAnSys into research
Merge branch 'research' of https://github.com/matfed/CoAnSys into research
Merge branch 'research' of https://github.com/matfed/CoAnSys into research
Merge branch 'research' of https://github.com/matfed/CoAnSys into research
Merge branch 'research' of https://github.com/matfed/CoAnSys into research
Merge pull request #148 from matfed/master

New output format and some other changes
fix entity generation
NewHeuristicAdder fixes
Merge branch 'master' into research

Conflicts:
	citations/core/src/main/scala/pl/edu/icm/coansys/citations/jobs/NewHeuristicAdder.scala
Merge branch 'master' into research
Merge branch 'master' into research
Merge branch 'research' of https://github.com/matfed/CoAnSys into research
take a whole citation into consideration
new test file generator
use approx year
using stopwords
Docs
Merge branch 'master' of https://github.com/CeON/CoAnSys