spider conso delete
Merge branch 'spider_conso_delete' of https://github.com/cdebortoli/scpm into spider_conso_delete

Conflicts:
	app/controllers/spiders_controller.rb
	app/models/stream.rb