.
Merge branch 'master' of https://github.com/hagdorn/jensenonline

Conflicts:
	includes/header.php