Fix to Subscriptions Controller and Model
Updated Subscription Controller RSPEC tests
Merge pull request #100 from alim/development_Joe

Development joe