Merge pull request #4 from couchbaselabs/stage

Updating to latest Stage branch [01-30-14]
2.5 edits for content/couchbase-manual-2.5/cb-admin/admin-tasks.markdown
2.5 changes
Add Japanese translation of Couchbase Server 1.8 and 2.0 to docs site
Merge branch 'japanese' into stage
Merge branch 'stage' of https://github.com/couchbaselabs/docs-ng into stage
2.5: best pract: disk throughput and sizing section.
Merge branch 'stage' of https://github.com/couchbaselabs/docs-ng into stage
layouts/default.erb: include meta description if available
update home page
Merge branch 'stage' of https://github.com/couchbaselabs/docs-ng into stage
index.html: add back <hr /> tag at bottom of page
layouts/default.erb: make pages with no toc use full width of container
2.5: release notes update
Merge branch 'stage' of https://github.com/couchbaselabs/docs-ng into stage
2.2.0-837 minor fix
Release notes for .NET SDK 1.3.4
2.5 release notes edit
index.html: don't be so welcoming
Merge branch 'stage' of https://github.com/couchbaselabs/docs-ng into stage