store ui
Merge branch 'master' into kj

Conflicts:
	index.html
update ui