111
Merge remote-tracking branch 'origin/v0.1.x' into v0.1.x

Conflicts:
	client/templates/page/default.html