Don't die if phantomjs returns non-zero.
Merge branch 'master' of https://github.com/by-implication/Open-Reconstruction into geotags
don't prerender main page
don't prerender main page
render normally instead of notFound
combine conditionals for prerendering
Merge branch 'master' into geotags

Conflicts:
	app/controllers/Application.scala
additional logging for errors
Merge branch 'geotags' into geotag-upload