首页文字不透明
Merge remote-tracking branch 'origin/master'

Conflicts:
	line/templates/public/header.html