viewpoint resize
Merge branch 'desktop'

Conflicts:
	client/index.html