Made proration optionally possible on subscribe() call
Merge branch 'hotfix/subscription_prorate' into develop