Merge branch 'simone'
modifica sezione videos css javascript e template
Merge branch 'daniele' into simone

Conflicts:
	configuration.php