Merge remote-tracking branch 'origin/master' into stardome-theme

Conflicts:
	src/TabbedArea.jsx
Merge branch 'stardome-theme' of github.com:quri/react-bootstrap into stardome-theme