don't prerender main page
render normally instead of notFound
combine conditionals for prerendering
Merge branch 'master' into geotags

Conflicts:
	app/controllers/Application.scala