[merge] Prep for merge
Merge branch 'master' of github.com:chichiwang/react-brunch-boilerplate