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

Conflicts:
	index.php
Monster commit from all the changes since Thursday.

Git problems all the way
Merge branch 'master' of https://github.com/jonasoesch/SplashyPants

Conflicts:
	controllers/PersonView.php
	index.php
	templates/_header.tpl
More merging
Merge branch 'master' of https://github.com/jonasoesch/SplashyPants