Merge branches 'another' and 'master' into another

Conflicts:
加入审核页面
更改标题
Merge branch 'another'

Conflicts:
	.gitignore
	Gemfile.lock
	app/views/layouts/application.html.erb