Fixed a bunch of issues with the blog
Merge branch 'master' into 386-Theme

Conflicts:
	client/index.html
	client/navigator.html
Fixed problems