add regression test to make sure that future subscriptions created after trials do not fail start / end dates (save properly)
fixes logic for subscription conflicts
fixes issue for subscriptions in the future
removes temporary fix for PR#3725
test for subscription conflicts
Merge pull request #3861 from dimagi/subscription-start-end-fix

Fixes issues with subscription start and end dates