Convert feeds_layers table to Subscription model
Merge branch 'refs/heads/subscriptions'

Conflicts:
	app/models/layer.rb
	app/views/layers/show.html.haml
	config/routes.rb
	db/schema.rb