Samples index
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/samples/index.html.erb
	config/locales/it.yml
Samples index