Merge origin/master

Conflicts:
	templates/preferiti.html
Merge origin/master

Conflicts:
	templates/preferiti.html
Merge origin/master

Conflicts:
	templates/preferiti.html
Merge origin/master

Conflicts:
	templates/esplora.html
Merge origin/master

Conflicts:
	templates/esplora.html
Merge origin/master

Conflicts:
	templates/esplora.html
Merge origin/master

Conflicts:
	templates/esplora.html
Merge origin/master

Conflicts:
	templates/esplora.html
Merge origin/master

Conflicts:
	templates/esplora.html
Merge origin/master

Conflicts:
	css/ale.css
	js/collections/ListaCalendario.js
	js/models/Calendario.js
	js/views/pages/ImpostazioniView.js
	templates/blocco_lista_ricerca.html
	templates/esplora.html
	templates/settings.html
Merge origin/master

Conflicts:
	css/ale.css
	js/collections/ListaCalendario.js
	js/models/Calendario.js
	js/views/pages/ImpostazioniView.js
	templates/blocco_lista_ricerca.html
	templates/esplora.html
	templates/settings.html