Merge branch 'component/twoapart' into dev

Conflicts:
	package.json
	src/tabs/tabs.js