* Finalize react branch; merging to master