Fixes "addchallenges" and "subscriptions"
Merge branch 'subscription' into dashboard