Updates updates updates ;-)
Updates updates updates ;-)
Updates updates updates ;-)
Updates updates updates ;-)
Updates updates updates ;-)
Merge branch 'master' into author_nadrowka

Conflicts:
	paper/rbefdata.Rmd
first attempts to merge
moving ontologies for merging into the discussion