default resource allocation adjusted
Bugfix character encoding in citation
Merge branch 'master' into filedetection