Hacking landing page
Merge branch 'master' of github.com:komoot/photon

Conflicts:
	website/photon/templates/index.html