Changed FluxContainer to merge return value of calculatedState into initial state of component.
Changed FluxContainer to merge return value of calculatedState into initial state of component.

aaron-goshine/flux,aaron-goshine/flux