Generate table of contents for guide articles
Update guides for 3.1 features
prep release
Move project templates to directory
stuff
prep release
add sitemap for search
add search
making 3.1 docs master
push to root docs site
push to root docs site
remove beta from sitemap file
Merge remote-tracking branch 'upstream/master' into ja

Conflicts:
	config.rb
	source/advanced/custom.html.markdown
	source/advanced/file-size-optimization.html.markdown
	source/advanced/improving-cacheability.html.markdown
	source/advanced/local-data.html.markdown
	source/advanced/localization.html.markdown
	source/advanced/rack-middleware.html.markdown
	source/advanced/sitemap.html.markdown
	source/asset-pipeline.markdown
	source/blogging.html.markdown
	source/community/3rd-party-extensions.html.erb
	source/community/3rd-party-project-templates.html.erb
	source/community/deployment-solutions.html.erb
	source/dynamic-pages.html.markdown
	source/frontmatter.html.markdown
	source/getting-started.html.markdown
	source/helpers.html.markdown
	source/layouts/_nav.erb
	source/livereload.html.markdown
	source/minify-html.html.markdown
	source/pretty-urls.html.markdown
	source/templates.html.markdown