design
Merge remote-tracking branch 'origin/jara' into jara

Conflicts:
	client/css/custom.css
	client/css/custom.less
	client/index.html
with react
z