Merge remote-tracking branch 'origin/master' into release-1.0.x
Merge latest changes from master into release-1.0.x

Conflicts:
	docs/blog/index.rst
	site/src/main/resources/application.conf
	site/src/main/scala/spray/site/ContentNode.scala
	site/src/main/scala/spray/site/Main.scala
	site/src/main/scala/spray/site/SiteSettings.scala
	site/src/main/scala/spray/site/SphinxDoc.scala
	site/src/main/twirl/page.scala.html