CB Server: fix typos
SDK Java Webpage Title Renamed
fixed numbered list
fixed merge conflicts
Merge pull request #18 from amy-kurtzman/stage

Stage
Java SDK with Intro
deleted unneeded half-backed untitled file
update Java SDK API reference link to 1.2
Merge pull request #19 from amy-kurtzman/stage

Stage
Labeled all SDK Guide Webpages
force merge
ruby intros
.NET intros
PHP intros
Python Intro
CB Server: fixed XDCR v1 vs. v2 issue MB-9149
Merge remote-tracking branch 'upstream/stage' into stage
CB Server: fix typos in administration section
Merge pull request #21 from amy-kurtzman/stage

Stage
Merge pull request #20 from brianshumate/master

cleanup