api changes
Merge branch 'plans&Api' of
https://github.com/sameerf3/Folio3ProduceStore.git into plans&Api

Conflicts:
	app/controllers/subscriptions_controller.rb