修改top背景颜色
修复view.html
修改背景色
Merge branch 'gl_master'

Conflicts:
	app/views/file/view.html.erb