Update css.
Merge branch 'master' into show-hide-table

Conflicts:
	server/css/main.css