2.5 update
Merge branch 'stage' of https://github.com/couchbaselabs/docs-ng into stage