Merge remote-tracking branch 'gith_ozone/gh-pages' into rmetzger_preview

Conflicts:
	quickstart/index.markdown
	quickstart/java.markdown
Merge branch 'front' into rmetzger_preview