Some fixes
Merge branches 'master' and 'master' of https://github.com/jonasoesch/SplashyPants

Conflicts:
	controllers/PersonView.php
Conflict resolve