f
Merge branch 'master' of https://github.com/eros23/biglietticharter.it

Conflicts:
	admin/modules/settings/index.php