Some important bits are different
Merge branch 'master' of https://github.com/gersande/drakkar-crossing

Conflicts:
	templates/footer.php