standardizing javadoc comments, adding wiki links and diagrams, for and/then/when
Merge upstream/master into OperationJoin2

Conflicts:
	rxjava-core/src/main/java/rx/Observable.java