Retain stripe customer id when switching from premium to basic to premium again
Merge branch 'master' into feature-redmine-109
Resume trial period when switching plans