1. 文档修订
2. nav中修正非内部链接的urlbug
Merge remote-tracking branch 'origin/master'

Conflicts:
	theme/templates/layout.html