misc
fixing
Merge branch 'master-redux'

Conflicts:
	build/public/index.html