Moving buildStaticAssets to react, template touches
Fixed style prop error
Merge branch 'react-sidebar'

Conflicts:
	build/bundle.min.js
	js/app.jsx
	js/main.js