comments…like…almost everywhere
someLateCommentaries
Merge branch 'master' of https://github.com/jonasoesch/SplashyPants

Conflicts:
	controllers/EventView.php
	controllers/PersonView.php
dfaf
Merge branch 'master' of https://github.com/jonasoesch/SplashyPants