Merge pull request #2148 from nordstrom-innovation/docfix

corrected highlighted/updated line in tutorial example
Merge pull request #2155 from rickbeerendonk/patch-1

Update video.md with Forward JS 2014 talk
Merge pull request #2158 from Daniel15/htmltojsx-move

Move htmltojsx.js to React-Magic project.
Merge pull request #2167 from mhintz/patch-1

Update ref-03-component-specs.md
Merge pull request #2170 from undernewmanagement/patch-1

Added extra explanation for require() statements
Merge pull request #2097 from fitzgen/explain-where-to-provide-key

Explain where to provide the key for dynamic children.
Merge pull request #2165 from DJCordhose/patch-1

Update 09.5-clone-with-props.md
Merge pull request #2178 from benfoxall/patch-1

Docs grammar tweak
Merge pull request #2218 from fisherwebdev/master

Acknowledge ProjectMoon for allowing us to use the flux name on npm
Move examples from the website to the wiki.

(cherry picked from commit 8cd460ce244cbeb707e02382f90fe5c114a96d46)
Merge pull request #2209 from glenjamin/patch-2

[docs] Clarify wording on sub-tree reconciliation
Merge pull request #2180 from zpao/fix-2179

Reword Component API intro
Merge pull request #2225 from jesseskinner/patch-1

Fix inconsistency in mockComponent argument name
Merge pull request #2228 from XuefengWu/patch-1

add tip for the important jsx convention