commit celesta italia et commentaire
Merge branch 'master' of https://github.com/jonasoesch/SplashyPants

Conflicts:
	controllers/EventView.php
	templates/editSlot.tpl
recommit