refactor project subscriptions
Merge branch 'subscriptions'