marineCommit
Merge branch 'master' of https://github.com/jonasoesch/SplashyPants

Conflicts:
	controllers/PersonView.php
	index.php
	templates/_header.tpl
Conflict resolution