Modify Subscription model to improve query performance
Merge branch 'master' of github.com:gkanwar/ZephyrPlus