UCHIC/ODM2 — pull request #36 by aufdenkampe (2014-03-13 18:33:47+00:00)
Title: Merge SamplingFeatures feature_branch2

Result of a long discussion at our March 13 meeting.