Merge branch 'allevidence_2' into 'allevidence'

new version ready for presentation

See merge request !13
1 job for allevidence in 3 seconds (queued for 7 seconds)