proper edit link
larger fonts
Merge branch 'master' into redmond

Conflicts:
	server/view/index.html