1
1
1
1
1
1
1
1
1
Merge branch 'wx' into gh-pages

Conflicts:
	src/css/g.css
	src/index.html
	src/shtml/inc/_head.shtml
	src/shtml/inc/_link_g.shtml