Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/catalog/index.html.erb
	config/locales/dias.da.yml
	config/locales/dias.en.yml
Merge remote-tracking branch 'origin/master'