ui update
Merge branch 'master' of github.com:beefoo/multi-screen-e-reader

Conflicts:
	client/css/style.css