Subscriptions Done
Incentives Done
Rake Fix
Merge branch 'master' into development

Conflicts:
	cucumber.yml
	features/support/env.rb
Fix Merge Issue
Merge branch 'development'