Align code
Merge branch 'native-browserify' into native-flux

Conflicts:
	src/components/item.js
	src/components/root.js
	src/router.js