Merge pull request #78 from thehyve/for_ts_master

REVERT all across-trial specific functionality; use transparent impl in core-db instead