WIP
Merge branch 'develop'

Conflicts:
	app/controllers/items_controller.rb
	app/views/websites/extraction.html.haml
	db/schema.rb