refactored to use payment enum, simplified bill collector
Merge branch 'master' of github.com:camperoo/subscriptions

Conflicts:
	app/models/subscriptions/invoice.rb
	app/services/subscriptions/bill_collector.rb
Added status enum to invoice